<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 58c2c0f1 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1622d61 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9afd7e66 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1622d61 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f506ffd0 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 08e21b3 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7cf77f7b (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) Code coverage for Bookstore
loading
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 851b4c0 (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages)
Generated 2022-09-06T10:36:10+03:00
======= <<<<<<< HEAD
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true)
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) >>>>>>> 16ebb0ff (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= ======= ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
Generated 2022-10-06T17:07:21+03:00
======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 23c4703e (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> d68e8240 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs)
Generated 2022-10-06T17:07:21+03:00
======= ======= >>>>>>> 96aecde (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) <<<<<<< HEAD >>>>>>> e75c983 (Fix) <<<<<<< HEAD >>>>>>> 22d61969 (Fix) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= =======
Generated 2022-10-06T17:07:21+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

All Files ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> cacbab9 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) 90.68% ======= <<<<<<< HEAD 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> d365be68 (Manifest_cache true) 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) >>>>>>> 16ebb0ff (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) 95.71% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) 95.79% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 23c4703e (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) 95.79% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) 95.79% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) <<<<<<< HEAD >>>>>>> e75c983 (Fix) <<<<<<< HEAD >>>>>>> 22d61969 (Fix) ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) covered at <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD 3.03 >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> cacbab9 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) 1.04 ======= <<<<<<< HEAD 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 3.92 >>>>>>> 752f0c0 (Featire specs) ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> d365be68 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> d365be68 (Manifest_cache true) 1.04 >>>>>>> aa7b40c (Manifest_cache true) ======= 3.9 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 2.92 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) >>>>>>> 16ebb0ff (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 2.92 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) 2.92 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 3.03 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) 3.03 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= ======= 3.34 >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 23c4703e (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 3.03 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) 3.03 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= 3.34 >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) 3.03 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= 3.34 >>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) <<<<<<< HEAD >>>>>>> e75c983 (Fix) <<<<<<< HEAD >>>>>>> 22d61969 (Fix) ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) hits/line )

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= ======= >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) 34 files in total. ======= <<<<<<< HEAD 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 84809242 (Featire specs) 92 files in total. >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd310ed (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 92 files in total. >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs)
1118 relevant lines, 1070 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 90.68% ======= 99.2% ======= 34 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 377 relevant lines, 374 lines covered and <<<<<<< HEAD 3 lines missed. ( <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 400 relevant lines, 397 lines covered and >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 400 relevant lines, 397 lines covered and <<<<<<< HEAD >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 400 relevant lines, 397 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD <<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 400 relevant lines, 397 lines covered and <<<<<<< HEAD >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 400 relevant lines, 397 lines covered and >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 400 relevant lines, 397 lines covered and >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) >>>>>>> 06e5e41 (Add login registration pages) >>>>>>> 8f1baf1c (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 06e5e41 (Add login registration pages) >>>>>>> 8f1baf1c (Add login registration pages) 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages)
400 relevant lines, 397 lines covered and ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= =======
400 relevant lines, 397 lines covered and >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> dda81aa9 (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= ======= ======= <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) 90.68% <<<<<<< HEAD ======= ======= 90.68% >>>>>>> 824bb2b (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 47 files in total. <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> a8b17c32 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 90.68% >>>>>>> 824bb2b (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> 4976a174 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) 99.11% >>>>>>> 4e81ea2 (Featire specs) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= 41 files in total. <<<<<<< HEAD ======= ======= 41 files in total. >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 41 files in total. >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= 41 files in total. >>>>>>> e3e66f3 (Featire specs) ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) =======
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) >>>>>>> 06e5e41 (Add login registration pages) >>>>>>> 8f1baf1c (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= 92 files in total. >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased)
1118 relevant lines, 1070 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 90.68% ======= 99.2% ======= 34 files in total. ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and 3 lines missed. ( >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 92 files in total.
1141 relevant lines, 1093 lines covered and 48 lines missed. ( 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) >>>>>>> 21873de0 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> 9bfbd88 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 41 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) ======= 41 files in total. <<<<<<< HEAD ======= 34 files in total. <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= ======= 41 files in total. <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= 99.2% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 112 files in total.
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 23c4703e (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 92 files in total.
1141 relevant lines, 1093 lines covered and 48 lines missed. ( 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 41 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= ======= 41 files in total. <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= 90.68% <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= 112 files in total.
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 41 files in total. <<<<<<< HEAD ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= ======= 41 files in total. <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 715fac2 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= 112 files in total.
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) <<<<<<< HEAD >>>>>>> e75c983 (Fix) <<<<<<< HEAD >>>>>>> 22d61969 (Fix) ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= ======= 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 41 files in total. <<<<<<< HEAD ======= ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) )
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> a2206025 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c0159bf (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> e59c273d (Manifest_cache true) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 446d79a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> e75c983 (Fix) >>>>>>> 22d61969 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> d68e8240 (Fix) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 22d61969 (Fix) ======= ======= >>>>>>> e75c983 (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) >>>>>>> e75c983 (Fix) >>>>>>> 22d61969 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1049b80c (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 490b01d6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84809242 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) >>>>>>> 53db2224 (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) >>>>>>> c033601 (Rebased) >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 96aecde (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 5a2009f1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> 385136b (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 385136b (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 1d11874 (Add login registration pages) >>>>>>> ff4c2fe0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 1d11874 (Add login registration pages) >>>>>>> ff4c2fe0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 852864e (Add login registration pages) >>>>>>> 1d11874 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 06e5e41 (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 51bc18c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd310ed (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> bdc24a1a (Rebased) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 659083f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> b97bb382 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 8249ff3c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> f416f45 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> e055dd0 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5b7749a (Fix) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 1d11874 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 852864e (Add login registration pages) >>>>>>> 1d11874 (Add login registration pages) >>>>>>> ff4c2fe0 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 9e081dc (Fix) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> e6fc67c7 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 393eff3b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> 56531f25 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) >>>>>>> 86229876 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 1049b80c (Fix) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
File % covered Lines Relevant Lines Lines covered Lines missed Avg. Hits / Line
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rbapp/controllers/application_controller.rb100.00 % 36 22 22 0 1.95app/controllers/application_controller.rbapp/controllers/application_controller.rbapp/controllers/application_controller.rb 100.00 % 2 1 1 0 1.00
app/admin/books.rb 100.00 % 57 41 41 0 2.49
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 4 4.71app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 21 1app/controllers/books_controller.rb 100.00 % 28 14 14 013.8640.91 % 36 22 9 13 0.41100.00 % 36 22 22 0 1.950 1.0013.3613.860 1.00
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 012.9012.7012.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 %app/admin/books.rb 100.00 %57 41 41 0 2.4977 51 51 0 4.20app/admin/books.rb 100.00 % 77 51app/admin/books.rb 100.00 % 77 5111 40 0.2251 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rbapp/admin/dashboard.rb 42.86 % 14 7 3 4 4.71
app/controllers/application_controller.rb100.00 % 3 2 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/admin/dashboard.rb42.86 % 14 7 3 44.715.864.71
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.401app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/admin/authors.rbapp/controllers/application_controller.rb100.00 % 36 22 22 0 1.95app/controllers/application_controller.rb100.00 % 2 1 1app/controllers/books_controller.rb 93.33 % 30 15 1414 013.8640.91 % 36 22 9 13 0.41100.00 % 36 22 22 0 1.9513.361 14.13
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 17 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 12 12 012.9012.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.0024.50
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 %57 41 41 0 2.4977 51 51 0 4.20app/admin/books.rb 100.00 % 77 5111 40 0.2251 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 44.715.86
app/controllers/application_controller.rbapp/controllers/application_controller.rb 100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.401app/controllers/application_controller.rb 100.00 % 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 01.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 11 1app/controllers/application_controller.rb 100.00 % 2 1 10 1.0013.86app/controllers/books_controller.rb100.00 % 24 12 12 0 13.500.435.86app/controllers/books_controller.rb 100.00 % 28 14 14 013.3613.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50
app/controllers/books_controller.rb93.75 % 31 1693.33 % 3015 113.9414.13app/controllers/books_controller.rb100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.931.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.500.90
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/admin/authors.rbapp/controllers/books_controller.rbapp/controllers/application_controller.rbapp/controllers/application_controller.rb100.00 % 36 2222 0 1.95app/controllers/application_controller.rbapp/controllers/application_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb 100.00 % 28 14 14 0 13.8640.91 % 36 22 9 13 0.41100.00 % 36 22 22 0 1.95app/controllers/application_controller.rbapp/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 2 0 1.00
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 28 14 14 013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50app/controllers/application_controller.rb 100.00 %1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 22 1 1 0 1.00
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 100.00 % 3 2 2 0 1.00
app/admin/dashboard.rb42.86 % 14 7 3 44.71app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86app/controllers/books_controller.rb 100.00 % 28 14 14 013.3613.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rbapp/controllers/application_controller.rb100.00 % 2 1 1app/controllers/application_controller.rb 100.00 % 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 01.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 11 10 1.0013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86
app/controllers/books_controller.rb93.75 % 31 1693.33 % 3015 113.9414.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.5013.8613.5013.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.931.86app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 100.00 % 3 2 2 0 1.00
app/controllers/application_controller.rb 100.00 % 15 10 10 0 47.20
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00
app/controllers/books_controller.rb 93.75 % 31 16 15 1 14.94
app/controllers/coupons_controller.rb 100.00 % 14 8 8 0 2.88
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/order_books_controller.rb 80.65 % 54 31 25 6 1.81
app/controllers/orders_controller.rb 100.00 % 7 4 4 0 2.50
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.5075.00 % 7 4 3 1 0.75100.00 % 7 4 4 0 1.501.25
app/decorators/book_decorator.rb100.00 %66.67 %100.00 %23 1212 024.500.90
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rb 100.00 % 2 1 10 1.001.86
app/controllers/books_controller.rb93.75 % 31 16 15 1 13.940 1.00
app/controllers/books_controller.rb93.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.5013.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 %19 10 10 0 1.3017 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 100.00 % 3 2 2 0 1.00
app/controllers/application_controller.rb 100.00 % 15 10 109 1 0.900 47.20
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.250 47.60
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00
app/controllers/books_controller.rb 93.75 % 31 16 15 113.94app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb14.94
app/controllers/coupons_controller.rb100.00 % 14 8 8 013.5013.8613.502.88
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/order_books_controller.rb 80.65 % 54 31 25 6 1.81
app/controllers/orders_controller.rb 100.00 % 7 4 4 0 2.50
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb100.00 % 7 432 21 1app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.869 13 0.4122 0 1.950 1.00
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 44 0 1.50
app/decorators/book_decorator.rb 100.00 %18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 100.00 % 3 2 2 0 1.00
app/admin/dashboard.rb42.86 % 14 7 3 44.71app/controllers/books_controller.rb 100.00 % 28 14 14 013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86app/controllers/books_controller.rb 100.00 % 28 14 14 013.3613.8613.36
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 109 1 0.9010 0 12.90100.00 % 2 1 1app/controllers/application_controller.rb 100.00 % 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 01.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.9010 0 12.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 21 11 10 1.0013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86
app/controllers/books_controller.rb93.75 % 31 1693.33 % 3015 113.9414.13app/controllers/books_controller.rb100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.931.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.5075.00 % 7 4 3 1 0.75100.00 % 7 4 4 0 1.501.251.251.25
app/decorators/book_decorator.rb100.00 %66.67 %100.00 %100.00 %100.00 %23 1212 024.500.90
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rb 100.00 % 2 1 10 1.001.86
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25app/controllers/books_controller.rb93.75 % 31 16 15 1 13.9493.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 %19 10 10 0 1.3017 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.501 0.75
app/decorators/book_decorator.rb100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 100.00 % 3 2 2 0 1.00
app/controllers/application_controller.rb 100.00 % 15 10 109 1 0.900 47.20
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.250 47.60
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00
app/decorators/author_decorator.rb 100.00 % 7 43 1 0.754 0 1.50
app/decorators/book_decorator.rb90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1100.00 % 2 1 10 1.00
app/controllers/books_controller.rb93.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.50app/controllers/books_controller.rb 93.75 % 31 16 15 113.94app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb14.94
app/controllers/coupons_controller.rb100.00 % 14 8 8 013.5013.8613.502.8813.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/order_books_controller.rb 80.65 % 54 31 25 6 1.81
app/controllers/orders_controller.rb 100.00 % 7 4 4 0 2.50
app/controllers/reviews_controller.rb 100.00 %17 9 9 0 1.3319 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.501.2575.00 % 7 4 3 1 0.75100.00 % 7 4 4 0 1.501.251.251.25
app/decorators/book_decorator.rb100.00 %66.67 %100.00 %100.00 %100.00 %100.00 %23 1266.67 % 23 1223 1212 024.5024.5024.5012.7090.00 % 18 109 1 0.9010 0 12.9027.5827.5027.5827.50
app/decorators/order_book_decorator.rb 100.00 % 9 5 5 01.001.0012 025.6712 0 24.5012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.40
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.7512 025.6712 0 24.5012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.40
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.75100.00 % 23 12 12 0 24.5025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.40
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.75
app/decorators/paginating_decorator.rb 100.00 % 3555552 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 91app/controllers/application_controller.rb 100.00 % 2 1 12 20 1.00
app/controllers/books_controller.rb93.33 % 30 15 14100.00 % 28 14100.00 % 28 14100.00 % 28 14100.00 % 28 1414 0 13.361 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/decorators/review_decorator.rb100.00 %7 4 4 0 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.861.861.861.861.86app/controllers/books_controller.rb1.868 4 0.67app/decorators/review_decorator.rb 100.00 % 7 4 4 0app/decorators/review_decorator.rb 100.00 % 7 4 4 01.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.401.861.861.861.861.861.861.861.861.861.861.861.861.861.861.861.861.861.861.86
app/helpers/application_helper.rb100.00 %7 4 45 3 30 5.00100.00 %5 3 3 0 4.6775.00 % 7 4 3 1 0.75100.00 %7 4 404.005.005 3 305.004.677 4 4 0 4.0075.00 % 7 4 3 1 0.75100.00 %7 4 4 0 4.00
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/jobs/application_job.rb 100.00 % 7 1 1 0 1.00
app/jobs/cart_cleaner.rb 60.00 % 8 5 3 2 0.60
app/models/address.rbapp/models/address.rb100.00 % 2412 12 0 13.5013.86app/controllers/books_controller.rb 100.00 %app/controllers/books_controller.rb 100.00 %24 12 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 17 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 12 12 012.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.0024.50
app/decorators/paginating_decorator.rb 100.00 % 3 2 2 07 7 01.00
app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.40
app/helpers/application_helper.rb 100.00 %100.00 %5 3 3 0 4.677 4 4 0 4.0075.00 % 7 4 3 1 0.75100.00 %100.00 %7 4 4 04.005.00
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/jobs/application_job.rb 100.00 % 7 1 1app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/jobs/cart_cleaner.rb 60.00 % 8 5 3 2 0.60
app/models/address.rb 100.00 % 247 7 0100.00 %app/controllers/books_controller.rb 100.00 %2412 12 013.36app/controllers/books_controller.rb 100.00 %app/controllers/books_controller.rb 100.00 %24 12 12 013.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 01.251.501.25
app/decorators/book_decorator.rb90.00 % 18 10 9 1 0.90100.00 % 18 10 10 0 12.7090.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 %53 2 2 07 7 07 7 01.00
app/decorators/paginating_decorator.rb 100.00 % 352 2 07 7 01.00
app/models/admin_user.rb 100.00 % 6app/helpers/application_helper.rb 100.00 % 3app/helpers/application_helper.rb 100.00 % 3app/helpers/application_helper.rb 100.00 % 3app/helpers/application_helper.rb 100.00 % 32 2app/helpers/application_helper.rbapp/models/admin_user.rb100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/models/admin_user.rb100.00 % 6 2 2100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 40 1.00
app/models/application_record.rb 100.00 % 3 2 2 0 1.00
app/models/author.rb 100.00 %6 4 46 4 47 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 56 4 40 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
7 5 57 5 57 5 56 4 46 4 47 5 57 5 57 5 57 5 50 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/billing.rb 100.00 % 2 1 16 4 4app/models/authors_book.rb 100.00 % 6 4 40 1.00
app/models/billing.rb 100.00 % 2 1 16 4 40 1.00
app/models/book.rb 100.00 %15 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 417 9 917 9 917 9 915 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 40 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 10app/models/book.rb 100.00 % 15 8 80 1.00
app/models/books_category.rb 100.00 % 6 4 417 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 40 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 100 1.00
app/models/books_category.rb 100.00 % 6 4 40 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 100 1.00
app/models/books_category.rb 100.00 % 6 4 4 0 1.00
app/models/category.rb 100.00 % 6 4 4 0 1.00
app/models/user.rbapp/models/review.rb100.00 % 16 7 7app/models/user.rbapp/models/review.rb100.00 %8 2 2100.00 % 16app/models/user.rb 100.00 % 8app/models/coupon.rb 100.00 % 32 216 7 70 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16 7 7app/models/review.rbapp/models/review.rbapp/models/review.rbapp/models/review.rb100.00 % 16 7 7100.00 % 167 7app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb100.00 % 16app/models/user.rb 100.00 %app/models/user.rb 100.00 % 8 2 2 0 1.00
app/queries/book_query.rb 87.50 % 1582 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/models/order.rb 100.00 % 6 4 40 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 1677 0 1.001 7.507 1 7.25
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.50
app/queries/book_query.rb 87.50 % 15 8app/queries/book_query.rb 87.50 % 15 87 70 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7 1app/models/shipping.rb 100.00 % 2 117.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.257.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.25app/models/shipping.rb 100.00 % 2 1 1 0 1.00app/models/user.rb 100.00 % 82 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16 7 7app/models/review.rb100.00 % 167 7app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/models/order.rb 100.00 % 6 4 40 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 167 7app/models/user.rb 100.00 % 8app/models/coupon.rb 100.00 % 32 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/models/order.rb 100.00 % 6 4 4 0 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 16 7 7 0 1.00
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.50
app/queries/book_query.rb 87.50 % 15 8app/queries/book_query.rb 87.50 % 15 87 70 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7 1app/models/shipping.rb 100.00 % 2 117.507.50app/queries/book_query.rb 87.50 % 15 8 7 17.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.257.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.25app/models/shipping.rb 100.00 % 2 1 1 0 1.00app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2 0 1.00
app/queries/book_query.rb 87.50 % 15 8 7 1 7.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/services/book_service.rb 88.89 % 19 9 8 1 1.56
app/services/coupon_service.rb 100.00 % 19 8 8 0 2.25
app/services/book_service.rb 88.89 % 19 9 8 1 1.56
app/services/coupon_service.rb 100.00 % 19 8 8 0 2.25
app/services/book_service.rb 88.89 % 19 9 8 1 1.56
app/services/coupon_service.rb 100.00 % 19 8 8 0 2.25
config/application.rb 100.00 % 22 6 6 0 1.00
config/boot.rb 100.00 % 4 3 3 0 1.00
config/environment.rb 100.00 % 5 2 2 0 1.00
config/environments/test.rb 100.00 % 6019 19 0 1.00
config/initializers/active_admin.rb 100.00 % 12 11 1118 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 180 1.00
config/initializers/application_controller_renderer.rb 100.00 % 8 0 0 0 0.00
config/initializers/assets.rb 100.00 % 14 2 2 0 1.00
config/initializers/backtrace_silencers.rb 100.00 % 8 1 1 0 1.00
config/initializers/content_security_policy.rb 100.00 % 30 0 0 0 0.00
config/initializers/cookies_serializer.rb 100.00 % 5 1 1 0 1.00
config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 1320 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 140 1.00
config/initializers/filter_parameter_logging.rb 100.00 % 6 1 1 0 1.00
config/initializers/inflections.rb 100.00 % 16 0 0 0 0.00
config/initializers/kaminari.rb 100.00 % 3 2 2 0 1.00
config/initializers/mime_types.rb 100.00 % 4 0 0 0 0.00
config/initializers/omniauth.rbconfig/initializers/omniauth.rbconfig/initializers/money.rbconfig/initializers/money.rbconfig/initializers/money.rb100.00 % 3 3 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rbconfig/initializers/money.rbconfig/initializers/money.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 33 32 23 33 30 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rb 100.00 % 3 2 23 33 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/permissions_policy.rb 100.00 % 11 0 0 0 0.00
config/initializers/wrap_parameters.rb 100.00 % 14 2 2 0 1.50
config/routes.rb 100.00 %7 4 45 3 317 9 917 9 917 9 95 3 37 4 45 3 37 4 417 9 917 9 917 9 95 3 35 3 35 3 37 4 45 3 37 4 417 9 917 9 917 9 95 3 37 4 417 9 95 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 1717 9 95 3 37 4 45 3 35 3 37 4 417 9 95 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 175 3 35 3 37 4 45 3 37 4 45 3 37 4 417 9 917 9 95 3 37 4 431 17 175 3 30 1.00
spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 0 1.60spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 01.291.60spec/decorators/author_decorator_spec.rb 100.00 % 13 7 7 0 1.29
spec/decorators/book_decorator_spec.rb 100.00 % 36 15 15 01.73
spec/factories/addresses.rb 100.00 % 4 2 2 0 1.001.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.73
spec/factories/admin_users.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/addresses.rb 100.00 % 4 2 2 0 1.00
spec/factories/admin_users.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/addresses.rb 100.00 % 4 2 2 0 1.00
spec/factories/admin_users.rb100.00 % 6 4 4 08.007.007.008.001.008.008.008.007.007.008.001.008.00
spec/factories/authors.rb 80.00 % 18 108 2 2.508 2 2.508 2 2.508 2 2.50spec/factories/authors.rbspec/factories/authors.rb100.00 % 6 4 4 01.007 3 0.708 2 2.507 3 0.708 2 2.507.001.008.008.00
spec/factories/authors.rb 80.00 % 18 108 2 2.508 2 2.508 2 2.50spec/factories/authors.rb 100.00 % 6 4 4 0 1.007 3 0.708 2 2.501.007 3 0.708 2 2.507 3 0.708 2 2.50
spec/factories/authors_books.rb 100.00 % 6 4 4 0 1.00
spec/factories/billings.rb 100.00 % 10 8 8 01.001.002.5669.562.5668.002.5668.002.5668.002.5669.561.001.001.001.001.00
spec/factories/books.rb 80.95 % 35 2117 4 45.52spec/factories/books.rbspec/factories/billings.rb100.00 % 10 8 8 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5615 6 0.7117 446.3845.5217 446.3817 446.3817 445.52spec/factories/books.rb 100.00 % 11 9 9 068.0068.002.5669.562.5668.0046.3868.002.5668.002.5668.0068.002.5669.5668.002.5669.5615 6 0.7117 4 46.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5668.0068.002.5669.562.562.5668.002.562.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.621.0068.0069.5615 6 0.71
spec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books.rb 80.95 % 35 21 17 4 45.5217 4 46.3845.5217 4 46.3817 446.3817 4 45.52spec/factories/books.rb 100.00 % 11 9 9 068.0068.002.5669.562.5668.0046.3868.002.5668.002.5668.0068.002.5669.5668.002.5669.5615 6 0.7117 4 46.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.562.5668.002.562.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.6268.0068.0046.3868.002.5668.002.5669.5668.002.5669.5615 6 0.7117 4 46.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.562.5668.002.5668.002.5668.002.5668.002.5669.5649.6268.002.5668.0068.00
spec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rb100.00 % 6 4 4 0 1.00
spec/factories/categories.rb 100.00 % 5 3 3 04.671.001.003.333.333.333.333.334.674.673.333.333.331.004.674.674.674.673.333.333.331.004.671.004.673.333.333.333.333.334.674.673.333.333.331.004.674.674.674.673.333.333.331.004.671.004.673.333.333.333.333.334.673.334.674.673.333.333.331.004.671.004.673.333.333.333.333.334.67
spec/factories/users.rbspec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rbspec/factories/reviews.rb100.00 %4 2 20 1.00spec/factories/users.rb 100.00 % 4 2 27 5 5spec/factories/coupons.rb 100.00 % 8 6 6 0 2.50
spec/factories/order_books.rb 100.00 % 7 5 5 0 1.80
spec/factories/orders.rb 77.78 % 17 9 7 2 1.56
spec/factories/coupons.rb 100.00 % 8 6 6 0 2.50
spec/factories/order_books.rb 100.00 % 7 5 5 0 1.80
spec/factories/orders.rb 77.78 % 17 9 7 2 1.56
spec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rb 100.00 % 4 2 27 5 50 1.00spec/factories/users.rbspec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rb 100.00 % 4 2 20 1.00spec/factories/users.rb 100.00 % 4 2 20 1.00spec/factories/users.rb 100.00 % 4 2 2 0 1.00
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.38
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.380 1.00
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.38
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.380 1.00
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.4011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.333.33
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.40
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 96.55 % 56 29 28 1 1.41
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17
spec/feature/cart_spec.rb 96.55 % 56 29 28 1 1.41
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17
spec/feature/home_spec.rb 100.00 %96 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/models/author_spec.rb 100.00 %13 8 8 0 1.50
spec/models/authors_book_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 913 8 80 1.5015 9 913 8 801.441.50
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.381.381.381.381.001.001.00
spec/feature/book_spec.rb1.00
spec/models/user_spec.rb100.00 % 202 105 105 02.371.001.531.53
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.380 1.00
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.40
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.33
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 96.55 % 56 29 28 1 1.41
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17
spec/feature/home_spec.rb 100.00 %96 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/models/author_spec.rb 100.00 %13 8 8 0 1.50
spec/models/authors_book_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 913 8 80 1.50
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.381.381.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.531.531.53
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.53spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3spec/support/configs/capybara.rb100.00 %36.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 190 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.001.001.001.001.001.001.001.53spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.88
spec/support/configs/capybara.rb100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %36.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 19 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.00100.00 % 30 19 19 0 1.00100.00 % 30 19 19 0 1.00100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 291919191919 0 1.007 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.37100.00 %36.84 % 29 19 7 12 0.37100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 1919 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.007 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29100.00 % 3019 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00
spec/support/configs/shoulda_matcher.rb 100.00 %88889999989999999899998898999999899989999989999989995 5 0 1.00
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
======= >>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed.
    
  1. 1 <<<<<<< HEAD ActiveAdmin.register AdminUser do ======= class ApplicationController < ActionController::Base
  2. end

app/controllers/books_controller.rb

100.0% lines covered

<<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 0 lines missed.
    
  1. 1 class BooksController < ApplicationController >>>>>>> 715fac2 (Featire specs)
  2. 1 <<<<<<< HEAD permit_params :email, :password, :password_confirmation ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) PAGINATION_PER_PAGE = 12 >>>>>>> 715fac2 (Featire specs)
  3. 1 <<<<<<< HEAD index do ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) def index >>>>>>> 715fac2 (Featire specs)
  4. <<<<<<< HEAD
  5. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  6. 24 <<<<<<< HEAD ======= =======
  7. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  8. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) selectable_column
  9. <<<<<<< HEAD
  10. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  11. 24 <<<<<<< HEAD ======= =======
  12. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  13. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) id_column
  14. <<<<<<< HEAD
  15. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  16. 24 >>>>>>> 715fac2 (Featire specs) column :email
  17. column :current_sign_in_at
  18. <<<<<<< HEAD
  19. column :sign_in_count
  20. column :created_at
  21. actions
  22. end
  23. =======
  24. <<<<<<< HEAD ======= =======
  25. >>>>>>> 752f0c0 (Featire specs) =======
  26. >>>>>>> 4e81ea2 (Featire specs) =======
  27. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)
  28. <<<<<<< HEAD
  29. 1 ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  30. 24 <<<<<<< HEAD ======= =======
  31. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  32. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD filter :email
  33. 1 filter :current_sign_in_at
  34. 1 filter :sign_in_count
  35. 1 filter :created_at
  36. 1 form do |f|
  37. f.inputs do
  38. f.input :email
  39. f.input :password
  40. f.input :password_confirmation
  41. end
  42. f.actions
  43. end
  44. end

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Author do
  2. 1 config.filters = true
  3. 1 permit_params :first_name, :last_name
  4. 1 filter :books, collection: Book.all
  5. 1 filter :first_name
  6. 1 filter :last_name
  7. 1 index do
  8. 3 selectable_column ======= <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)
  9. <<<<<<< HEAD
  10. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  11. =======
  12. >>>>>>> 752f0c0 (Featire specs) =======
  13. >>>>>>> 4e81ea2 (Featire specs) =======
  14. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  15. <<<<<<< HEAD
  16. 3 ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  17. 24 <<<<<<< HEAD ======= =======
  18. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  19. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) column :first_name
  20. <<<<<<< HEAD
  21. 3 ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  22. 24 <<<<<<< HEAD ======= =======
  23. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  24. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) column :last_name
  25. <<<<<<< HEAD
  26. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  27. 24 <<<<<<< HEAD ======= =======
  28. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  29. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)
  30. <<<<<<< HEAD
  31. 3 ======= <<<<<<< HEAD
  32. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  33. =======
  34. >>>>>>> 752f0c0 (Featire specs) =======
  35. >>>>>>> 4e81ea2 (Featire specs) =======
  36. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 1 >>>>>>> 715fac2 (Featire specs) actions
  37. <<<<<<< HEAD
  38. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  39. =======
  40. >>>>>>> 752f0c0 (Featire specs) =======
  41. >>>>>>> 4e81ea2 (Featire specs) =======
  42. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) end
  43. <<<<<<< HEAD
  44. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  45. =======
  46. >>>>>>> 752f0c0 (Featire specs) =======
  47. >>>>>>> 4e81ea2 (Featire specs) =======
  48. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  49. <<<<<<< HEAD
  50. 1 show do
  51. 3 attributes_table do
  52. 3 row :first_name
  53. 3 row :last_name
  54. 3 row :books
  55. ======= <<<<<<< HEAD
  56. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  57. =======
  58. >>>>>>> 752f0c0 (Featire specs) =======
  59. >>>>>>> 4e81ea2 (Featire specs) =======
  60. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) end
  61. <<<<<<< HEAD
  62. end
  63. 1 form do |f|
  64. 2 f.inputs do
  65. 2 f.input :first_name
  66. 2 f.input :last_name
  67. 2 f.input :books, as: :select, collection: Book.all
  68. end
  69. 2 f.actions
  70. end
  71. end

app/admin/books.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) 41 relevant lines. 41 lines covered and ======= 51 relevant lines. 51 lines covered and >>>>>>> b28889f (Fix) 0 lines missed. ======= 51 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) 11 lines covered and 40 lines missed. >>>>>>> 49e8a6c (Rebased) ======= 51 lines covered and 0 lines missed. >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fdab719f (Fix) 41 relevant lines. 41 lines covered and ======= 51 relevant lines. 51 lines covered and >>>>>>> b28889f (Fix) 0 lines missed. >>>>>>> c7a726c5 (Rebased) ======= 11 lines covered and 40 lines missed. >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> e18eb87 (Fix) 41 relevant lines. 41 lines covered and ======= 51 relevant lines. 51 lines covered and >>>>>>> b28889f (Fix) 0 lines missed. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= 11 lines covered and 40 lines missed. >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
    
  1. 1 ActiveAdmin.register Book do
  2. 1 permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD author_ids: [], category_ids: [], images: [] ======= category_ids: [], author_ids: [] >>>>>>> c7a726c5 (Rebased) ======= author_ids: [], category_ids: [], images: [] >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) author_ids: [], category_ids: [], images: [] ======= category_ids: [], author_ids: [] >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= author_ids: [], category_ids: [], images: [] >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
  4. 1 decorate_with BookDecorator
  5. 1 filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
  6. 1 filter :categories
  7. 1 filter :title
  8. 1 filter :year_of_publication
  9. 1 index do
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  11. 4 =======
  12. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  13. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  14. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  15. 4 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  16. 4 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) selectable_column
  17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  18. 4 =======
  19. 6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  20. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  21. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) column :categories, &:categories_names
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  23. 6 >>>>>>> b28889f (Fix) =======
  24. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  25. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  26. 4 >>>>>>> c7a726c5 (Rebased) =======
  27. 6 >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  28. 4 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= =======
  29. 6 >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) column :title
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  31. 4 =======
  32. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  33. 4 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 99dad91f (Fix) =======
  34. 4 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) column :year_of_publication
  35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix)
  36. 4 =======
  37. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  38. 4 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 99dad91f (Fix) =======
  39. 4 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) column :materials
  40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix)
  41. 4 =======
  42. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  43. 4 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 99dad91f (Fix) =======
  44. 4 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) column :dimensions
  45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix)
  46. 4 column :price_cents, &:price
  47. 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) =======
  48. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) column :quantity
  49. 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  50. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  51. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) column :authors, &:authors_names
  52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  53. 4 =======
  54. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  55. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  56. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  57. 4 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  58. 4 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) column :description
  59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix)
  60. 6 =======
  61. <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) =======
  62. 6 >>>>>>> 8288136d (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= =======
  63. 6 >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) column :price, &:price
  64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix)
  65. 6 =======
  66. <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) =======
  67. 6 >>>>>>> 8288136d (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= =======
  68. 6 >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) column :quantity
  69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix)
  70. 6 =======
  71. <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) =======
  72. 6 >>>>>>> 8288136d (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= =======
  73. 6 >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) actions <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= column :categories, &:categories_names >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= column :categories, &:categories_names >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= ======= column :categories, &:categories_names >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
  74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) =======
  75. 4 actions
  76. <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) end
  77. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  78. =======
  79. >>>>>>> c7a726c5 (Rebased) =======
  80. >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased)
  81. =======
  82. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= =======
  83. >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
  84. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  85. =======
  86. >>>>>>> c7a726c5 (Rebased) =======
  87. >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased)
  88. =======
  89. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= =======
  90. >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) 1 show do
  91. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  92. 3 =======
  93. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  94. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  95. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  96. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  97. 3 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) attributes_table do
  98. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  99. 3 =======
  100. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  101. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  102. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  103. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  104. 3 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) row :authors, &:authors_names
  105. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  106. 3 =======
  107. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  108. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  109. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  110. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  111. 3 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) row :categories, &:categories_names
  112. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  113. 3 =======
  114. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  115. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  116. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  117. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  118. 3 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) row :year_of_publication
  119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  120. 3 =======
  121. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  122. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  123. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  124. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  125. 3 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) row :description
  126. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  127. 3 =======
  128. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  129. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  130. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  131. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  132. 3 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) row :materials
  133. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  134. 3 =======
  135. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  136. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  137. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  138. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  139. 3 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) row :dimensions
  140. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  141. 3 =======
  142. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  143. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  144. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  145. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  146. 3 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) row :price, &:price
  147. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  148. 3 =======
  149. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  150. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  151. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  152. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  153. 3 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) row :created_at
  154. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  155. 3 =======
  156. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  157. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  158. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  159. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  160. 3 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) row :updated_at
  161. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  162. =======
  163. >>>>>>> c7a726c5 (Rebased) =======
  164. >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased)
  165. =======
  166. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= =======
  167. >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) end
  168. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
  169. =======
  170. 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) panel :images do
  171. 5 table do
  172. 5 book.images.each do |image|
  173. 2 span image_tag image.variant(resize_to_limit: [100, 100])
  174. end
  175. ======= <<<<<<< HEAD
  176. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  177. =======
  178. >>>>>>> 752f0c0 (Featire specs) =======
  179. >>>>>>> 4e81ea2 (Featire specs) =======
  180. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) end
  181. <<<<<<< HEAD
  182. end
  183. >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  184. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= =======
  185. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= =======
  186. >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) end
  187. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) =======
  188. >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= =======
  189. >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
  190. >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
  191. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased)
  192. ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  193. >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  194. >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) panel :images do
  195. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix)
  196. 5 =======
  197. <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) =======
  198. 5 >>>>>>> 8288136d (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= =======
  199. 5 >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) table do
  200. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix)
  201. 5 =======
  202. <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) =======
  203. 5 >>>>>>> 8288136d (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= =======
  204. 5 >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) book.images.each do |image|
  205. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix)
  206. 2 =======
  207. <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) =======
  208. 2 >>>>>>> 8288136d (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= =======
  209. 2 >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) span image_tag image.variant(resize_to_limit: [100, 100])
  210. end
  211. end
  212. end
  213. end
  214. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  215. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= =======
  216. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= =======
  217. >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) 1 form do |f|
  218. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  219. 2 =======
  220. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  221. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  222. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  223. 2 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  224. 2 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.inputs do
  225. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  226. 2 =======
  227. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  228. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  229. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  230. 2 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  231. 2 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.input :title
  232. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  233. 2 =======
  234. 6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  235. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  236. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.input :description
  237. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  238. 6 >>>>>>> b28889f (Fix) =======
  239. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  240. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  241. 2 >>>>>>> c7a726c5 (Rebased) =======
  242. 6 >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  243. 2 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= =======
  244. 6 >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.input :year_of_publication
  245. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  246. 2 =======
  247. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  248. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  249. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  250. 2 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  251. 2 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.input :price_cents
  252. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  253. 2 =======
  254. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  255. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  256. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  257. 2 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  258. 2 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.input :materials
  259. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  260. 2 =======
  261. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  262. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  263. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  264. 2 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  265. 2 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.input :dimensions
  266. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  267. 2 =======
  268. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  269. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  270. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  271. 2 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  272. 2 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.input :quantity
  273. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) =======
  274. 2 f.input :description, as: :text
  275. 2 f.input :categories, as: :select, collection: Category.all
  276. 2 f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  277. end
  278. 2 f.actions
  279. <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
  280. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
  281. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  282. 6 =======
  283. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  284. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  285. 6 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  286. 6 >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.input :categories, as: :select, collection: Category.all
  287. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  288. 6 =======
  289. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  290. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  291. 6 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  292. 6 >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  293. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  294. 6 =======
  295. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  296. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  297. 6 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  298. 6 >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.input :images, as: :file, input_html: { multiple: true }
  299. end
  300. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  301. 6 =======
  302. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  303. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  304. 6 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  305. 6 >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) panel :images do
  306. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  307. 6 =======
  308. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  309. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  310. 6 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  311. 6 >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.object.images.each do |image|
  312. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  313. 1 =======
  314. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  315. 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  316. 1 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  317. 1 >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) span image_tag image.variant(resize_to_limit: [100, 100])
  318. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  319. 1 =======
  320. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  321. 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  322. 1 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  323. 1 >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
  324. data: { confirm: "Delete #{image.filename}?" })
  325. end
  326. end
  327. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  328. 6 =======
  329. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  330. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  331. 6 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  332. 6 >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) f.actions
  333. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) end
  334. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  335. ======= ======= >>>>>>> 49e8a6c (Rebased)
  336. 1 member_action :delete_image, method: :delete do
  337. <<<<<<< HEAD <<<<<<< HEAD
  338. 1 =======
  339. >>>>>>> 49e8a6c (Rebased) =======
  340. 1 >>>>>>> 872e675 (Fix) ActiveStorage::Attachment.find(params[:id]).destroy
  341. <<<<<<< HEAD <<<<<<< HEAD
  342. 1 =======
  343. >>>>>>> 49e8a6c (Rebased) =======
  344. 1 >>>>>>> 872e675 (Fix) redirect_back(fallback_location: edit_admin_book_path)
  345. ======= >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) end
  346. <<<<<<< HEAD
  347. <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) =======
  348. >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased)
  349. ======= ======= >>>>>>> 49e8a6c (Rebased)
  350. 1 member_action :delete_image, method: :delete do
  351. <<<<<<< HEAD <<<<<<< HEAD
  352. 1 =======
  353. >>>>>>> 49e8a6c (Rebased) =======
  354. 1 >>>>>>> 872e675 (Fix) ActiveStorage::Attachment.find(params[:id]).destroy
  355. <<<<<<< HEAD <<<<<<< HEAD
  356. 1 =======
  357. >>>>>>> 49e8a6c (Rebased) =======
  358. 1 >>>>>>> 872e675 (Fix) redirect_back(fallback_location: edit_admin_book_path)
  359. ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) end
  360. <<<<<<< HEAD
  361. <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= =======
  362. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased)
  363. ======= ======= >>>>>>> 49e8a6c (Rebased)
  364. 1 member_action :delete_image, method: :delete do
  365. <<<<<<< HEAD <<<<<<< HEAD
  366. 1 =======
  367. >>>>>>> 49e8a6c (Rebased) =======
  368. 1 >>>>>>> 872e675 (Fix) ActiveStorage::Attachment.find(params[:id]).purge_later
  369. <<<<<<< HEAD <<<<<<< HEAD
  370. 1 =======
  371. >>>>>>> 49e8a6c (Rebased) =======
  372. 1 >>>>>>> 872e675 (Fix) redirect_back(fallback_location: edit_admin_book_path)
  373. end
  374. <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) end

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Category do
  2. 1 permit_params :name, book_ids: []
  3. 1 filter :books, collection: Book.all
  4. 1 filter :name
  5. 1 index do
  6. 4 selectable_column
  7. 4 column :name
  8. 4 actions
  9. end
  10. 1 show do
  11. 3 attributes_table do
  12. 3 row :name
  13. 3 row :created_at
  14. 3 row :updated_at
  15. ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs)
  16. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  17. =======
  18. >>>>>>> 752f0c0 (Featire specs) =======
  19. >>>>>>> 4e81ea2 (Featire specs) =======
  20. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) end
  21. <<<<<<< HEAD
  22. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  23. =======
  24. >>>>>>> 752f0c0 (Featire specs) =======
  25. >>>>>>> 4e81ea2 (Featire specs) =======
  26. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) end
  27. <<<<<<< HEAD
  28. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  29. =======
  30. >>>>>>> 752f0c0 (Featire specs) =======
  31. >>>>>>> 4e81ea2 (Featire specs) =======
  32. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  33. <<<<<<< HEAD
  34. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  35. =======
  36. >>>>>>> 752f0c0 (Featire specs) =======
  37. >>>>>>> 4e81ea2 (Featire specs) =======
  38. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 1 form do |f|
  39. <<<<<<< HEAD
  40. 2 ======= <<<<<<< HEAD
  41. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  42. =======
  43. >>>>>>> 752f0c0 (Featire specs) =======
  44. >>>>>>> 4e81ea2 (Featire specs) =======
  45. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD f.inputs do ======= <<<<<<< HEAD @book = Book.find(params[:id]).decorate ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @book = Book.find(params[:id]).decorate ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)
  46. <<<<<<< HEAD
  47. 2 ======= <<<<<<< HEAD
  48. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  49. =======
  50. >>>>>>> 752f0c0 (Featire specs) =======
  51. >>>>>>> 4e81ea2 (Featire specs) =======
  52. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) f.input :name
  53. <<<<<<< HEAD
  54. 2 ======= <<<<<<< HEAD
  55. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  56. =======
  57. >>>>>>> 752f0c0 (Featire specs) =======
  58. >>>>>>> 4e81ea2 (Featire specs) =======
  59. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 >>>>>>> 715fac2 (Featire specs) f.input :books, as: :select, collection: Book.all
  60. <<<<<<< HEAD
  61. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  62. =======
  63. >>>>>>> 752f0c0 (Featire specs) =======
  64. >>>>>>> 4e81ea2 (Featire specs) =======
  65. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) end
  66. <<<<<<< HEAD
  67. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  68. =======
  69. >>>>>>> 752f0c0 (Featire specs) =======
  70. >>>>>>> 4e81ea2 (Featire specs) =======
  71. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  72. 2 f.actions
  73. end
  74. end

app/admin/coupons.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Coupon do
  2. 1 permit_params :code, :is_active, :active_till_date, :discount, :order_id
  3. end

app/admin/dashboard.rb

44.44% lines covered

9 relevant lines. 4 lines covered and 5 lines missed.
    
  1. # frozen_string_literal: true
  2. 1 ActiveAdmin.register_page 'Dashboard' do
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  4. 31 =======
  5. 39 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) =======
  6. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) =======
  7. 39 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  8. 31 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) =======
  9. 31 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
  10. 1 action_item only: :show do
  11. link_to 'SideKiq View', sidekiq_web_path
  12. end
  13. 1 content title: proc { I18n.t('active_admin.dashboard') } do
  14. div class: 'blank_slate_container', id: 'dashboard_default_message' do
  15. span class: 'blank_slate' do
  16. span I18n.t('active_admin.dashboard_welcome.welcome')
  17. small I18n.t('active_admin.dashboard_welcome.call_to_action')
  18. end
  19. end
  20. end
  21. end

app/admin/orders.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Order do
  2. 1 permit_params :user_id, :coupon_id, :total_price, :status, :last_action
  3. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed.
    
  1. 1 ActiveAdmin.register AdminUser do
  2. 1 permit_params :email, :password, :password_confirmation
  3. 1 index do
  4. selectable_column
  5. id_column
  6. column :email
  7. column :current_sign_in_at
  8. column :sign_in_count
  9. column :created_at
  10. actions
  11. end
  12. 1 filter :email
  13. 1 filter :current_sign_in_at
  14. 1 filter :sign_in_count
  15. 1 filter :created_at
  16. 1 form do |f|
  17. f.inputs do
  18. f.input :email
  19. f.input :password
  20. f.input :password_confirmation
  21. end
  22. f.actions
  23. end
  24. end

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Author do
  2. 1 config.filters = true
  3. 1 permit_params :first_name, :last_name
  4. 1 filter :books, collection: Book.all
  5. 1 filter :first_name
  6. 1 filter :last_name
  7. 1 index do
  8. 3 selectable_column
  9. 3 column :first_name
  10. 3 column :last_name
  11. 3 actions
  12. end
  13. 1 show do
  14. 3 attributes_table do
  15. 3 row :first_name
  16. 3 row :last_name
  17. 3 row :books
  18. end
  19. end
  20. 1 form do |f|
  21. 2 f.inputs do
  22. 2 f.input :first_name
  23. 2 f.input :last_name
  24. 2 f.input :books, as: :select, collection: Book.all
  25. end
  26. 2 f.actions
  27. end
  28. end

app/admin/books.rb

100.0% lines covered

51 relevant lines. <<<<<<< HEAD <<<<<<< HEAD 51 lines covered and 0 lines missed. ======= 11 lines covered and 40 lines missed. >>>>>>> 11792758 (Rebased) ======= 51 lines covered and 0 lines missed. >>>>>>> 31d15e66 (Fix)
    
  1. 1 ActiveAdmin.register Book do
  2. 1 permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
  3. author_ids: [], category_ids: [], images: []
  4. 1 decorate_with BookDecorator
  5. 1 filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
  6. 1 filter :categories
  7. 1 filter :title
  8. 1 filter :year_of_publication
  9. 1 index do
  10. <<<<<<< HEAD <<<<<<< HEAD
  11. 6 =======
  12. >>>>>>> 11792758 (Rebased) =======
  13. 6 >>>>>>> 31d15e66 (Fix) selectable_column
  14. <<<<<<< HEAD <<<<<<< HEAD
  15. 6 =======
  16. >>>>>>> 11792758 (Rebased) =======
  17. 6 >>>>>>> 31d15e66 (Fix) column :categories, &:categories_names
  18. <<<<<<< HEAD <<<<<<< HEAD
  19. 6 =======
  20. >>>>>>> 11792758 (Rebased) =======
  21. 6 >>>>>>> 31d15e66 (Fix) column :title
  22. <<<<<<< HEAD <<<<<<< HEAD
  23. 6 =======
  24. >>>>>>> 11792758 (Rebased) =======
  25. 6 >>>>>>> 31d15e66 (Fix) column :authors, &:authors_names
  26. <<<<<<< HEAD <<<<<<< HEAD
  27. 6 =======
  28. >>>>>>> 11792758 (Rebased) =======
  29. 6 >>>>>>> 31d15e66 (Fix) column :description
  30. <<<<<<< HEAD <<<<<<< HEAD
  31. 6 =======
  32. >>>>>>> 11792758 (Rebased) =======
  33. 6 >>>>>>> 31d15e66 (Fix) column :price, &:price
  34. <<<<<<< HEAD <<<<<<< HEAD
  35. 6 =======
  36. >>>>>>> 11792758 (Rebased) =======
  37. 6 >>>>>>> 31d15e66 (Fix) column :quantity
  38. <<<<<<< HEAD <<<<<<< HEAD
  39. 6 =======
  40. >>>>>>> 11792758 (Rebased) =======
  41. 6 >>>>>>> 31d15e66 (Fix) actions
  42. end
  43. 1 show do
  44. <<<<<<< HEAD <<<<<<< HEAD
  45. 5 =======
  46. >>>>>>> 11792758 (Rebased) =======
  47. 5 >>>>>>> 31d15e66 (Fix) attributes_table do
  48. <<<<<<< HEAD <<<<<<< HEAD
  49. 5 =======
  50. >>>>>>> 11792758 (Rebased) =======
  51. 5 >>>>>>> 31d15e66 (Fix) row :authors, &:authors_names
  52. <<<<<<< HEAD <<<<<<< HEAD
  53. 5 =======
  54. >>>>>>> 11792758 (Rebased) =======
  55. 5 >>>>>>> 31d15e66 (Fix) row :categories, &:categories_names
  56. <<<<<<< HEAD <<<<<<< HEAD
  57. 5 =======
  58. >>>>>>> 11792758 (Rebased) =======
  59. 5 >>>>>>> 31d15e66 (Fix) row :year_of_publication
  60. <<<<<<< HEAD <<<<<<< HEAD
  61. 5 =======
  62. >>>>>>> 11792758 (Rebased) =======
  63. 5 >>>>>>> 31d15e66 (Fix) row :description
  64. <<<<<<< HEAD <<<<<<< HEAD
  65. 5 =======
  66. >>>>>>> 11792758 (Rebased) =======
  67. 5 >>>>>>> 31d15e66 (Fix) row :materials
  68. <<<<<<< HEAD <<<<<<< HEAD
  69. 5 =======
  70. >>>>>>> 11792758 (Rebased) =======
  71. 5 >>>>>>> 31d15e66 (Fix) row :dimensions
  72. <<<<<<< HEAD <<<<<<< HEAD
  73. 5 =======
  74. >>>>>>> 11792758 (Rebased) =======
  75. 5 >>>>>>> 31d15e66 (Fix) row :price, &:price
  76. <<<<<<< HEAD <<<<<<< HEAD
  77. 5 =======
  78. >>>>>>> 11792758 (Rebased) =======
  79. 5 >>>>>>> 31d15e66 (Fix) row :created_at
  80. <<<<<<< HEAD <<<<<<< HEAD
  81. 5 =======
  82. >>>>>>> 11792758 (Rebased) =======
  83. 5 >>>>>>> 31d15e66 (Fix) row :updated_at
  84. end
  85. <<<<<<< HEAD <<<<<<< HEAD
  86. 5 =======
  87. >>>>>>> 11792758 (Rebased) =======
  88. 5 >>>>>>> 31d15e66 (Fix) panel :images do
  89. <<<<<<< HEAD <<<<<<< HEAD
  90. 5 =======
  91. >>>>>>> 11792758 (Rebased) =======
  92. 5 >>>>>>> 31d15e66 (Fix) table do
  93. <<<<<<< HEAD <<<<<<< HEAD
  94. 5 =======
  95. >>>>>>> 11792758 (Rebased) =======
  96. 5 >>>>>>> 31d15e66 (Fix) book.images.each do |image|
  97. <<<<<<< HEAD <<<<<<< HEAD
  98. 2 =======
  99. >>>>>>> 11792758 (Rebased) =======
  100. 2 >>>>>>> 31d15e66 (Fix) span image_tag image.variant(resize_to_limit: [100, 100])
  101. end
  102. end
  103. end
  104. end
  105. 1 form do |f|
  106. <<<<<<< HEAD <<<<<<< HEAD
  107. 6 =======
  108. >>>>>>> 11792758 (Rebased) =======
  109. 6 >>>>>>> 31d15e66 (Fix) f.inputs do
  110. <<<<<<< HEAD <<<<<<< HEAD
  111. 6 =======
  112. >>>>>>> 11792758 (Rebased) =======
  113. 6 >>>>>>> 31d15e66 (Fix) f.input :title
  114. <<<<<<< HEAD <<<<<<< HEAD
  115. 6 =======
  116. >>>>>>> 11792758 (Rebased) =======
  117. 6 >>>>>>> 31d15e66 (Fix) f.input :description
  118. <<<<<<< HEAD <<<<<<< HEAD
  119. 6 =======
  120. >>>>>>> 11792758 (Rebased) =======
  121. 6 >>>>>>> 31d15e66 (Fix) f.input :year_of_publication
  122. <<<<<<< HEAD <<<<<<< HEAD
  123. 6 =======
  124. >>>>>>> 11792758 (Rebased) =======
  125. 6 >>>>>>> 31d15e66 (Fix) f.input :price_cents
  126. <<<<<<< HEAD <<<<<<< HEAD
  127. 6 =======
  128. >>>>>>> 11792758 (Rebased) =======
  129. 6 >>>>>>> 31d15e66 (Fix) f.input :materials
  130. <<<<<<< HEAD <<<<<<< HEAD
  131. 6 =======
  132. >>>>>>> 11792758 (Rebased) =======
  133. 6 >>>>>>> 31d15e66 (Fix) f.input :dimensions
  134. <<<<<<< HEAD <<<<<<< HEAD
  135. 6 =======
  136. >>>>>>> 11792758 (Rebased) =======
  137. 6 >>>>>>> 31d15e66 (Fix) f.input :quantity
  138. <<<<<<< HEAD <<<<<<< HEAD
  139. 6 =======
  140. >>>>>>> 11792758 (Rebased) =======
  141. 6 >>>>>>> 31d15e66 (Fix) f.input :categories, as: :select, collection: Category.all
  142. <<<<<<< HEAD <<<<<<< HEAD
  143. 6 =======
  144. >>>>>>> 11792758 (Rebased) =======
  145. 6 >>>>>>> 31d15e66 (Fix) f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  146. <<<<<<< HEAD <<<<<<< HEAD
  147. 6 =======
  148. >>>>>>> 11792758 (Rebased) =======
  149. 6 >>>>>>> 31d15e66 (Fix) f.input :images, as: :file, input_html: { multiple: true }
  150. end
  151. <<<<<<< HEAD <<<<<<< HEAD
  152. 6 =======
  153. >>>>>>> 11792758 (Rebased) =======
  154. 6 >>>>>>> 31d15e66 (Fix) panel :images do
  155. <<<<<<< HEAD <<<<<<< HEAD
  156. 6 =======
  157. >>>>>>> 11792758 (Rebased) =======
  158. 6 >>>>>>> 31d15e66 (Fix) f.object.images.each do |image|
  159. <<<<<<< HEAD <<<<<<< HEAD
  160. 1 =======
  161. >>>>>>> 11792758 (Rebased) =======
  162. 1 >>>>>>> 31d15e66 (Fix) span image_tag image.variant(resize_to_limit: [100, 100])
  163. <<<<<<< HEAD <<<<<<< HEAD
  164. 1 =======
  165. >>>>>>> 11792758 (Rebased) =======
  166. 1 >>>>>>> 31d15e66 (Fix) span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
  167. data: { confirm: "Delete #{image.filename}?" })
  168. end
  169. end
  170. <<<<<<< HEAD <<<<<<< HEAD
  171. 6 =======
  172. >>>>>>> 11792758 (Rebased) =======
  173. 6 >>>>>>> 31d15e66 (Fix) f.actions
  174. end
  175. 1 member_action :delete_image, method: :delete do
  176. <<<<<<< HEAD <<<<<<< HEAD
  177. 1 =======
  178. >>>>>>> 11792758 (Rebased) =======
  179. 1 >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD ActiveStorage::Attachment.find(params[:id]).purge_later ======= ActiveStorage::Attachment.find(params[:id]).destroy >>>>>>> 11792758 (Rebased) ======= ActiveStorage::Attachment.find(params[:id]).purge_later >>>>>>> ef483b6d (Fix)
  180. <<<<<<< HEAD <<<<<<< HEAD
  181. 1 =======
  182. >>>>>>> 11792758 (Rebased) =======
  183. 1 >>>>>>> 31d15e66 (Fix) redirect_back(fallback_location: edit_admin_book_path)
  184. end
  185. end

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Category do
  2. 1 permit_params :name, book_ids: []
  3. 1 filter :books, collection: Book.all
  4. 1 filter :name
  5. 1 index do
  6. 4 selectable_column
  7. 4 column :name
  8. 4 actions
  9. end
  10. 1 show do
  11. 3 attributes_table do
  12. 3 row :name
  13. 3 row :created_at
  14. 3 row :updated_at
  15. end
  16. end
  17. 1 form do |f|
  18. 2 f.inputs do
  19. 2 f.input :name
  20. 2 f.input :books, as: :select, collection: Book.all
  21. end
  22. 2 f.actions
  23. end
  24. end

app/admin/coupons.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Coupon do
  2. 1 permit_params :code, :is_active, :active_till_date, :discount, :order_id
  3. end

app/admin/dashboard.rb

44.44% lines covered

9 relevant lines. 4 lines covered and 5 lines missed.
    
  1. # frozen_string_literal: true
  2. 1 ActiveAdmin.register_page 'Dashboard' do
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. 39 =======
  5. 1 >>>>>>> 11792758 (Rebased) =======
  6. 39 >>>>>>> 31d15e66 (Fix) menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
  7. 1 action_item only: :show do
  8. link_to 'SideKiq View', sidekiq_web_path
  9. end
  10. 1 content title: proc { I18n.t('active_admin.dashboard') } do
  11. div class: 'blank_slate_container', id: 'dashboard_default_message' do
  12. span class: 'blank_slate' do
  13. span I18n.t('active_admin.dashboard_welcome.welcome')
  14. small I18n.t('active_admin.dashboard_welcome.call_to_action')
  15. end
  16. end
  17. end
  18. <<<<<<< HEAD end

app/admin/orders.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Order do
  2. 1 permit_params :user_id, :coupon_id, :total_price, :status, :last_action
  3. ======= >>>>>>> ef483b6d (Fix) end
<<<<<<< HEAD

app/admin/orders.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Order do
  2. 1 permit_params :user_id, :coupon_id, :total_price, :status, :last_action
  3. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

app/controllers/application_controller.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 10 lines covered and ======= 1 relevant lines. 1 lines covered and >>>>>>> 6da9530 (Featire specs) ======= 10 relevant lines. 10 lines covered and >>>>>>> 9e081dc (Fix) 0 lines missed.
    
  1. 1 class ApplicationController < ActionController::Base
  2. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix)
  3. 1 before_action :user_or_guest_have_order
  4. 1 private
  5. 1 def user_or_guest_have_order
  6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 22d61969 (Fix)
  7. 164 =======
  8. 166 <<<<<<< HEAD >>>>>>> ef483b6d (Fix) =======
  9. 164 >>>>>>> d68e8240 (Fix) ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
  10. 164 >>>>>>> e75c983 (Fix) >>>>>>> 22d61969 (Fix) if current_user
  11. 36 session[:order_id] = Order.find_or_create_by(user_id: current_user.id).id
  12. 36 CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
  13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 22d61969 (Fix)
  14. 128 =======
  15. 130 <<<<<<< HEAD >>>>>>> ef483b6d (Fix) =======
  16. 128 >>>>>>> d68e8240 (Fix) ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
  17. 128 >>>>>>> e75c983 (Fix) >>>>>>> 22d61969 (Fix) elsif session[:order_id].nil?
  18. 52 session[:order_id] = Order.create.id
  19. 52 CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
  20. end
  21. end
  22. <<<<<<< HEAD =======
  23. >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 9e081dc (Fix) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)

app/controllers/books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 93.33% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) 93.33% ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) 93.33% ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= 93.33% ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) 93.75% >>>>>>> c4adab0 (Featire specs) ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= 93.75% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 93.75% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 93.33% >>>>>>> c7a726c5 (Rebased) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= 93.75% >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= 93.75% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) 93.33% ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 93.75% >>>>>>> c4adab0 (Featire specs) ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 93.75% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 93.75% >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) 93.33% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 15 relevant lines. 14 lines covered and 1 lines missed. ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 15 relevant lines. 14 lines covered and 1 lines missed. ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 99dad91f (Fix) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 3723aad (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) 14 relevant lines. 14 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> f92a45b (Featire specs) 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e18eb87 (Fix) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> e3e66f3 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> e3e66f3 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= 16 relevant lines. 15 lines covered and 1 lines missed. <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 5507b42 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    
  1. 1 class BooksController < ApplicationController
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) def index ======= ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 2612be03 (Featire specs) def index ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> 9bfbd88 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 824bb2b (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> e3e66f3 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 6da9530 (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. =======
  5. ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
  6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) >>>>>>> 752f0c0 (Featire specs) =======
  7. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) def index ======= <<<<<<< HEAD ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> 9bfbd88 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 824bb2b (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> e3e66f3 (Featire specs)
  8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
  9. <<<<<<< HEAD ======= =======
  10. ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 752f0c0 (Featire specs) =======
  11. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) def index
  12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= ======= ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages)
  13. >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 009401d (Featire specs) 24 ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs)
  14. 24 <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) =======
  15. ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix)
  16. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  17. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  18. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  19. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  20. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs)
  21. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages)
  22. 25 =======
  23. 25 >>>>>>> 9620751 (Featire specs) =======
  24. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  25. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  26. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  27. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  28. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= =======
  29. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  30. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  31. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  32. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  33. 25 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= =======
  34. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  35. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  36. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs)
  37. 25 =======
  38. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= =======
  39. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= =======
  40. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  41. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= =======
  42. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  43. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= =======
  44. 24 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) @books_count = Book.count
  45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
  46. =======
  47. >>>>>>> 752f0c0 (Featire specs) =======
  48. >>>>>>> 4e81ea2 (Featire specs) 24 ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= ======= ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages)
  49. 24 <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) =======
  50. ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix)
  51. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  52. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  53. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  54. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  55. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs)
  56. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages)
  57. 25 =======
  58. 25 >>>>>>> 9620751 (Featire specs) =======
  59. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  60. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  61. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  62. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  63. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= =======
  64. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  65. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  66. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  67. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  68. 25 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) ======= ======= ======= =======
  69. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= =======
  70. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  71. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs)
  72. 25 =======
  73. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= =======
  74. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= ======= =======
  75. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  76. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= =======
  77. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  78. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= =======
  79. 24 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) @categories = Category.all
  80. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs)
  81. 24 >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  82. 24 =======
  83. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  84. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  85. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  86. 25 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  87. 25 =======
  88. 25 >>>>>>> 9620751 (Featire specs) =======
  89. 25 >>>>>>> 2a25e4c (Featire specs) =======
  90. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  91. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  92. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  93. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  94. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  95. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= =======
  96. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= =======
  97. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= =======
  98. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= ======= =======
  99. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  100. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= =======
  101. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= <<<<<<< HEAD <<<<<<< HEAD sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
  102. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  103. ======= <<<<<<< HEAD <<<<<<< HEAD
  104. =======
  105. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
  106. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) =======
  107. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
  108. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  109. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) =======
  110. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= =======
  111. 24 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= =======
  112. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) per_page: Constants::PAGINATION_PER_PAGE) ======= <<<<<<< HEAD <<<<<<< HEAD per_page: Constants::PAGINATION_PER_PAGE) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs)
  113. =======
  114. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  115. >>>>>>> 0d6dd12 (Manifest_cache true) =======
  116. >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= =======
  117. >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  118. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  119. 25 =======
  120. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  121. 1 >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) =======
  122. 1 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) def index
  123. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  124. 24 <<<<<<< HEAD ======= =======
  125. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> f416f45 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
  126. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  127. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  128. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  129. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  130. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  131. 25 =======
  132. 25 >>>>>>> 9620751 (Featire specs) =======
  133. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  134. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  135. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  136. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
  137. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  138. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs)
  139. 25 >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  140. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  141. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  142. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  143. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  144. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  145. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  146. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  147. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
  148. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
  149. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  150. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  151. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  152. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  153. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  154. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  155. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  156. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) @books_count = Book.count
  157. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  158. 24 <<<<<<< HEAD ======= =======
  159. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> f416f45 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
  160. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  161. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  162. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  163. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  164. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  165. 25 =======
  166. 25 >>>>>>> 9620751 (Featire specs) =======
  167. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  168. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  169. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  170. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
  171. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  172. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs)
  173. 25 >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  174. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  175. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  176. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  177. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  178. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  179. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  180. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  181. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
  182. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
  183. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  184. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  185. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  186. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  187. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  188. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  189. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  190. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) @categories = Category.all
  191. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  192. 24 <<<<<<< HEAD ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c7a726c5 (Rebased)
  193. 24 =======
  194. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  195. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  196. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  197. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  198. 25 =======
  199. 25 >>>>>>> 9620751 (Featire specs) =======
  200. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  201. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  202. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  203. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
  204. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  205. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  206. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  207. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  208. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
  209. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> b832d45 (Featire specs) ======= =======
  210. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
  211. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) =======
  212. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  213. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
  214. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= =======
  215. 25 =======
  216. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  217. <<<<<<< HEAD
  218. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  219. =======
  220. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  221. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  222. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  223. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  224. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) =======
  225. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  226. 24 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
  227. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  228. 24 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
  229. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) per_page: PAGINATION_PER_PAGE) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) per_page: Constants::PAGINATION_PER_PAGE) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> ae07231a (Featire specs) @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49f2e24 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> 53db2224 (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 36356d3 (Featire specs) ======= ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
  230. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
  231. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 1d11874 (Add login registration pages) >>>>>>> ff4c2fe0 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) @books = BookDecorator.decorate_collection(sorted_books) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> f182ac7 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD def index ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 99dad91f (Fix) def index
  232. 25 @books_count = Book.count
  233. 25 @categories = Category.all
  234. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
  235. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> 1d11874 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) =======
  236. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 06e5e41 (Add login registration pages) =======
  237. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) =======
  238. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) =======
  239. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  240. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  241. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= =======
  242. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  243. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) sorted_books = BookQuery.query(params).paginate(page: params[:page],
  244. per_page: PAGINATION_PER_PAGE) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
  245. 25 @books_count = Book.count
  246. 25 @categories = Category.all
  247. 25 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
  248. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) =======
  249. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) =======
  250. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) =======
  251. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  252. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  253. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= =======
  254. 25 >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) sorted_books = BookQuery.query(params).paginate(page: params[:page],
  255. <<<<<<< HEAD per_page: PAGINATION_PER_PAGE) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 31d15e66 (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e18eb87 (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)
  256. <<<<<<< HEAD
  257. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
  258. >>>>>>> 752f0c0 (Featire specs) =======
  259. >>>>>>> 4e81ea2 (Featire specs) =======
  260. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) =======
  261. >>>>>>> c7a726c5 (Rebased)
  262. 25 <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) def index
  263. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  264. 24 <<<<<<< HEAD ======= =======
  265. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  266. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) @books_count = Book.count
  267. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  268. 24 <<<<<<< HEAD ======= =======
  269. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  270. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) @categories = Category.all
  271. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  272. 24 sorted_books = BookQuery.query(params).paginate(page: params[:page],
  273. per_page: PAGINATION_PER_PAGE) >>>>>>> 9bfbd88 (Featire specs)
  274. <<<<<<< HEAD ======= =======
  275. >>>>>>> 752f0c0 (Featire specs) =======
  276. >>>>>>> 4e81ea2 (Featire specs) =======
  277. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)
  278. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
  279. =======
  280. >>>>>>> 752f0c0 (Featire specs) =======
  281. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  282. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  283. 24 >>>>>>> 08edf50 (Featire specs) =======
  284. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages)
  285. 24 <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> c871248 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
  286. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs)
  287. 25 <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) =======
  288. 25 >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
  289. 25 <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
  290. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  291. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  292. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  293. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  294. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) @books = BookDecorator.decorate_collection(sorted_books) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookDecorator.decorate_collection(sorted_books) ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  295. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  296. ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  297. ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true)
  298. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  299. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  300. >>>>>>> 752f0c0 (Featire specs) =======
  301. >>>>>>> 4e81ea2 (Featire specs) =======
  302. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
  303. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  304. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  305. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  306. =======
  307. >>>>>>> 752f0c0 (Featire specs) =======
  308. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  309. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  310. 24 >>>>>>> 08edf50 (Featire specs) =======
  311. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  312. 25 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  313. 24 <<<<<<< HEAD ======= =======
  314. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  315. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
  316. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
  317. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 73dcd461 (Add login registration pages)
  318. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) =======
  319. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= =======
  320. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
  321. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
  322. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  323. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
  324. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) =======
  325. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> f182ac7 (Add login registration pages) =======
  326. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  327. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  328. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  329. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  330. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books)
  331. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages)
  332. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= =======
  333. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
  334. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  335. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= =======
  336. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
  337. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  338. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= =======
  339. 25 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs)
  340. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  341. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  342. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD =======
  343. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  344. 25 >>>>>>> 730a8ca (Add login registration pages) =======
  345. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  346. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
  347. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 0d6dd12 (Manifest_cache true) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> e3e66f3 (Featire specs)
  348. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  349. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  350. =======
  351. >>>>>>> 752f0c0 (Featire specs) =======
  352. >>>>>>> 4e81ea2 (Featire specs) =======
  353. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  354. >>>>>>> 0d6dd12 (Manifest_cache true) =======
  355. >>>>>>> e3e66f3 (Featire specs)
  356. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
  357. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  358. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  359. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  360. 24 <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) =======
  361. 25 <<<<<<< HEAD =======
  362. 25 >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  363. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  364. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  365. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  366. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  367. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
  368. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  369. 25 >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  370. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  371. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  372. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
  373. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) =======
  374. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= =======
  375. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  376. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  377. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= =======
  378. 25 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs)
  379. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  380. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  381. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD =======
  382. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  383. 25 >>>>>>> 730a8ca (Add login registration pages) =======
  384. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  385. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
  386. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 0d6dd12 (Manifest_cache true) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> e3e66f3 (Featire specs)
  387. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  388. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  389. =======
  390. >>>>>>> 752f0c0 (Featire specs) =======
  391. >>>>>>> 4e81ea2 (Featire specs) =======
  392. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  393. >>>>>>> 0d6dd12 (Manifest_cache true) =======
  394. >>>>>>> e3e66f3 (Featire specs)
  395. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
  396. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  397. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  398. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  399. 24 <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) =======
  400. 25 <<<<<<< HEAD =======
  401. 25 >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  402. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  403. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  404. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  405. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  406. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
  407. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  408. 25 >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  409. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  410. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  411. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
  412. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages)
  413. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  414. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  415. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD =======
  416. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  417. 25 >>>>>>> 730a8ca (Add login registration pages) =======
  418. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) =======
  419. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= =======
  420. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= =======
  421. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= =======
  422. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  423. <<<<<<< HEAD
  424. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  425. =======
  426. >>>>>>> 752f0c0 (Featire specs) =======
  427. >>>>>>> 4e81ea2 (Featire specs) =======
  428. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  429. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages)
  430. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  431. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  432. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  433. 24 <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) =======
  434. 25 <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  435. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  436. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  437. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  438. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
  439. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= =======
  440. 25 >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= =======
  441. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  442. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  443. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= =======
  444. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= =======
  445. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= =======
  446. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= =======
  447. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= =======
  448. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  449. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= =======
  450. 24 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) respond_to do |format|
  451. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= ======= ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  452. =======
  453. >>>>>>> 752f0c0 (Featire specs) =======
  454. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  455. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  456. 24 >>>>>>> 08edf50 (Featire specs) =======
  457. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  458. 25 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
  459. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
  460. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
  461. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  462. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
  463. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
  464. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  465. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages)
  466. 24 <<<<<<< HEAD ======= =======
  467. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  468. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
  469. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  470. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages)
  471. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  472. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  473. 25 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  474. 25 >>>>>>> 9620751 (Featire specs) ======= =======
  475. 25 >>>>>>> 6da9530 (Featire specs) =======
  476. 25 >>>>>>> 9620751 (Featire specs) =======
  477. 25 >>>>>>> 2a25e4c (Featire specs) =======
  478. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
  479. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  480. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
  481. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  482. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  483. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  484. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  485. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  486. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  487. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  488. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) ======= ======= =======
  489. 25 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
  490. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  491. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  492. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  493. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  494. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  495. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  496. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  497. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  498. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
  499. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  500. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  501. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  502. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
  503. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  504. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  505. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  506. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  507. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= =======
  508. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  509. 24 <<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= =======
  510. 25 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= =======
  511. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= =======
  512. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= =======
  513. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  514. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
  515. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= =======
  516. 24 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) format.html
  517. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= ======= ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  518. =======
  519. >>>>>>> 752f0c0 (Featire specs) =======
  520. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  521. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  522. 24 >>>>>>> 08edf50 (Featire specs) =======
  523. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  524. 25 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
  525. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
  526. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
  527. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  528. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
  529. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
  530. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  531. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages)
  532. 24 <<<<<<< HEAD ======= =======
  533. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  534. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
  535. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  536. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages)
  537. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  538. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  539. 25 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  540. 25 >>>>>>> 9620751 (Featire specs) ======= =======
  541. 25 >>>>>>> 6da9530 (Featire specs) =======
  542. 25 >>>>>>> 9620751 (Featire specs) =======
  543. 25 >>>>>>> 2a25e4c (Featire specs) =======
  544. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
  545. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  546. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
  547. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  548. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  549. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  550. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  551. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  552. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  553. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  554. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) ======= ======= =======
  555. 25 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
  556. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  557. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  558. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  559. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  560. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  561. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  562. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  563. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  564. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
  565. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  566. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  567. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  568. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
  569. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  570. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  571. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  572. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  573. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= =======
  574. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  575. 24 <<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= =======
  576. 25 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= =======
  577. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= =======
  578. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= =======
  579. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  580. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
  581. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= =======
  582. 24 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) format.json do
  583. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  584. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  585. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
  586. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  587. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
  588. =======
  589. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  590. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  591. =======
  592. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  593. >>>>>>> 94841b5 (Featire specs) =======
  594. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  595. =======
  596. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  597. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  598. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  599. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  600. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  601. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  602. =======
  603. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  604. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  605. >>>>>>> e54deeb (Featire specs) =======
  606. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  607. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  608. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  609. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  610. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  611. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  612. =======
  613. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  614. >>>>>>> 9c0d812 (Featire specs) =======
  615. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  616. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  617. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  618. =======
  619. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  620. >>>>>>> 9c0d812 (Featire specs) =======
  621. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  622. =======
  623. >>>>>>> 9c0d812 (Featire specs) =======
  624. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
  625. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  626. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  627. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  628. =======
  629. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  630. >>>>>>> 94841b5 (Featire specs) =======
  631. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  632. >>>>>>> 3b03895 (Featire specs) =======
  633. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  634. >>>>>>> e54deeb (Featire specs) =======
  635. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  636. >>>>>>> 9c0d812 (Featire specs) =======
  637. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  638. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  639. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
  640. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  641. =======
  642. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  643. >>>>>>> 9c0d812 (Featire specs) =======
  644. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  645. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
  646. =======
  647. >>>>>>> 752f0c0 (Featire specs) =======
  648. >>>>>>> 4e81ea2 (Featire specs) =======
  649. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  650. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  651. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  652. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
  653. =======
  654. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
  655. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  656. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
  657. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  658. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  659. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  660. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  661. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  662. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  663. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  664. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  665. =======
  666. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  667. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  668. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  669. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  670. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  671. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  672. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  673. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  674. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  675. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  676. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  677. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  678. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  679. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  680. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  681. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  682. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  683. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  684. =======
  685. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  686. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  687. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  688. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  689. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  690. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  691. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  692. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  693. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  694. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  695. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
  696. =======
  697. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
  698. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
  699. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
  700. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  701. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
  702. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  703. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  704. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  705. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 render json: {
  706. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  707. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  708. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
  709. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  710. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
  711. =======
  712. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  713. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  714. =======
  715. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  716. >>>>>>> 94841b5 (Featire specs) =======
  717. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  718. =======
  719. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  720. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  721. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  722. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  723. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  724. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  725. =======
  726. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  727. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  728. >>>>>>> e54deeb (Featire specs) =======
  729. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  730. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  731. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  732. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  733. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  734. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  735. =======
  736. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  737. >>>>>>> 9c0d812 (Featire specs) =======
  738. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  739. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  740. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  741. =======
  742. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  743. >>>>>>> 9c0d812 (Featire specs) =======
  744. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  745. =======
  746. >>>>>>> 9c0d812 (Featire specs) =======
  747. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
  748. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  749. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  750. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  751. =======
  752. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  753. >>>>>>> 94841b5 (Featire specs) =======
  754. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  755. >>>>>>> 3b03895 (Featire specs) =======
  756. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  757. >>>>>>> e54deeb (Featire specs) =======
  758. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  759. >>>>>>> 9c0d812 (Featire specs) =======
  760. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  761. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  762. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
  763. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  764. =======
  765. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  766. >>>>>>> 9c0d812 (Featire specs) =======
  767. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  768. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
  769. =======
  770. >>>>>>> 752f0c0 (Featire specs) =======
  771. >>>>>>> 4e81ea2 (Featire specs) =======
  772. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  773. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  774. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  775. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
  776. =======
  777. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
  778. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  779. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
  780. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  781. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  782. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  783. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  784. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  785. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  786. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  787. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  788. =======
  789. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  790. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  791. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  792. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  793. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  794. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  795. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  796. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  797. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  798. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  799. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  800. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  801. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  802. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  803. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  804. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  805. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  806. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  807. =======
  808. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  809. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  810. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  811. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  812. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  813. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  814. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  815. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  816. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  817. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  818. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
  819. =======
  820. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
  821. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
  822. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
  823. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  824. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
  825. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  826. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  827. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  828. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD entries: render_to_string(partial: 'books/index/books', formats: [:html]), ======= entries: render_to_string(partial: 'books', formats: [:html]), >>>>>>> 6da9530 (Featire specs) ======= entries: render_to_string(partial: 'books/index/books', formats: [:html]), >>>>>>> 9e081dc (Fix)
  829. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  830. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  831. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
  832. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  833. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
  834. =======
  835. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  836. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  837. =======
  838. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  839. >>>>>>> 94841b5 (Featire specs) =======
  840. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  841. =======
  842. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  843. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  844. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  845. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  846. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  847. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  848. =======
  849. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  850. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  851. >>>>>>> e54deeb (Featire specs) =======
  852. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  853. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  854. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  855. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  856. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  857. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  858. =======
  859. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  860. >>>>>>> 9c0d812 (Featire specs) =======
  861. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  862. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  863. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  864. =======
  865. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  866. >>>>>>> 9c0d812 (Featire specs) =======
  867. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  868. =======
  869. >>>>>>> 9c0d812 (Featire specs) =======
  870. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
  871. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  872. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  873. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  874. =======
  875. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  876. >>>>>>> 94841b5 (Featire specs) =======
  877. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  878. >>>>>>> 3b03895 (Featire specs) =======
  879. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  880. >>>>>>> e54deeb (Featire specs) =======
  881. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  882. >>>>>>> 9c0d812 (Featire specs) =======
  883. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  884. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  885. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
  886. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  887. =======
  888. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  889. >>>>>>> 9c0d812 (Featire specs) =======
  890. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  891. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
  892. =======
  893. >>>>>>> 752f0c0 (Featire specs) =======
  894. >>>>>>> 4e81ea2 (Featire specs) =======
  895. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  896. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  897. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  898. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
  899. =======
  900. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
  901. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  902. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
  903. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  904. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  905. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  906. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  907. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  908. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  909. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  910. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  911. =======
  912. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  913. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  914. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  915. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  916. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  917. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  918. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  919. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  920. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  921. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  922. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  923. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  924. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  925. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  926. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  927. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  928. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  929. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  930. =======
  931. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  932. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  933. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  934. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  935. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  936. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  937. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  938. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  939. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  940. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  941. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
  942. =======
  943. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
  944. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
  945. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
  946. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  947. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
  948. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  949. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  950. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  951. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) pagination: view_context.will_paginate(@books)
  952. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  953. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  954. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
  955. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  956. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
  957. =======
  958. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  959. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  960. =======
  961. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  962. >>>>>>> 94841b5 (Featire specs) =======
  963. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  964. =======
  965. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  966. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  967. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  968. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  969. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  970. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  971. =======
  972. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  973. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  974. >>>>>>> e54deeb (Featire specs) =======
  975. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  976. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  977. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  978. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  979. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  980. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  981. =======
  982. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  983. >>>>>>> 9c0d812 (Featire specs) =======
  984. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  985. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  986. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  987. =======
  988. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  989. >>>>>>> 9c0d812 (Featire specs) =======
  990. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  991. =======
  992. >>>>>>> 9c0d812 (Featire specs) =======
  993. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
  994. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  995. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  996. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  997. =======
  998. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  999. >>>>>>> 94841b5 (Featire specs) =======
  1000. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1001. >>>>>>> 3b03895 (Featire specs) =======
  1002. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1003. >>>>>>> e54deeb (Featire specs) =======
  1004. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1005. >>>>>>> 9c0d812 (Featire specs) =======
  1006. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1007. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  1008. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
  1009. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1010. =======
  1011. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1012. >>>>>>> 9c0d812 (Featire specs) =======
  1013. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1014. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
  1015. =======
  1016. >>>>>>> 752f0c0 (Featire specs) =======
  1017. >>>>>>> 4e81ea2 (Featire specs) =======
  1018. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  1019. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1020. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1021. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
  1022. =======
  1023. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
  1024. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1025. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
  1026. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1027. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  1028. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1029. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1030. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1031. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1032. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1033. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1034. =======
  1035. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1036. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1037. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1038. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1039. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1040. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1041. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1042. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1043. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  1044. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1045. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1046. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1047. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1048. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1049. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1050. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  1051. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1052. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1053. =======
  1054. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1055. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1056. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1057. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1058. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1059. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1060. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1061. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1062. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  1063. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1064. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
  1065. =======
  1066. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
  1067. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
  1068. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
  1069. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1070. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
  1071. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1072. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  1073. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1074. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) }
  1075. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1076. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  1077. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
  1078. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1079. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
  1080. =======
  1081. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1082. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1083. =======
  1084. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1085. >>>>>>> 94841b5 (Featire specs) =======
  1086. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1087. =======
  1088. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1089. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  1090. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1091. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1092. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1093. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  1094. =======
  1095. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  1096. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1097. >>>>>>> e54deeb (Featire specs) =======
  1098. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1099. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1100. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1101. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1102. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1103. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1104. =======
  1105. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1106. >>>>>>> 9c0d812 (Featire specs) =======
  1107. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1108. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1109. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  1110. =======
  1111. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1112. >>>>>>> 9c0d812 (Featire specs) =======
  1113. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1114. =======
  1115. >>>>>>> 9c0d812 (Featire specs) =======
  1116. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
  1117. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1118. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1119. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  1120. =======
  1121. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1122. >>>>>>> 94841b5 (Featire specs) =======
  1123. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1124. >>>>>>> 3b03895 (Featire specs) =======
  1125. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1126. >>>>>>> e54deeb (Featire specs) =======
  1127. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1128. >>>>>>> 9c0d812 (Featire specs) =======
  1129. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1130. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  1131. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
  1132. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1133. =======
  1134. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1135. >>>>>>> 9c0d812 (Featire specs) =======
  1136. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1137. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
  1138. =======
  1139. >>>>>>> 752f0c0 (Featire specs) =======
  1140. >>>>>>> 4e81ea2 (Featire specs) =======
  1141. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  1142. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1143. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1144. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
  1145. =======
  1146. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
  1147. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1148. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
  1149. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1150. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  1151. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1152. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1153. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1154. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1155. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1156. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1157. =======
  1158. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1159. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1160. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1161. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1162. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1163. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1164. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1165. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1166. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  1167. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1168. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1169. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1170. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1171. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1172. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1173. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  1174. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1175. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1176. =======
  1177. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1178. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1179. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1180. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1181. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1182. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1183. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1184. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1185. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  1186. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1187. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
  1188. =======
  1189. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
  1190. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
  1191. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
  1192. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1193. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
  1194. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1195. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  1196. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1197. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
  1198. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1199. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  1200. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
  1201. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1202. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
  1203. =======
  1204. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1205. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1206. =======
  1207. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1208. >>>>>>> 94841b5 (Featire specs) =======
  1209. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1210. =======
  1211. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1212. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  1213. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1214. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1215. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1216. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  1217. =======
  1218. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  1219. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1220. >>>>>>> e54deeb (Featire specs) =======
  1221. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1222. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1223. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1224. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1225. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1226. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1227. =======
  1228. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1229. >>>>>>> 9c0d812 (Featire specs) =======
  1230. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1231. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1232. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  1233. =======
  1234. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1235. >>>>>>> 9c0d812 (Featire specs) =======
  1236. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1237. =======
  1238. >>>>>>> 9c0d812 (Featire specs) =======
  1239. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
  1240. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1241. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1242. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  1243. =======
  1244. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1245. >>>>>>> 94841b5 (Featire specs) =======
  1246. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1247. >>>>>>> 3b03895 (Featire specs) =======
  1248. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1249. >>>>>>> e54deeb (Featire specs) =======
  1250. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1251. >>>>>>> 9c0d812 (Featire specs) =======
  1252. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1253. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  1254. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
  1255. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1256. =======
  1257. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1258. >>>>>>> 9c0d812 (Featire specs) =======
  1259. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1260. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
  1261. =======
  1262. >>>>>>> 752f0c0 (Featire specs) =======
  1263. >>>>>>> 4e81ea2 (Featire specs) =======
  1264. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  1265. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1266. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1267. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
  1268. =======
  1269. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
  1270. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1271. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
  1272. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1273. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  1274. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1275. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1276. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1277. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1278. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1279. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1280. =======
  1281. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1282. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1283. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1284. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1285. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1286. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1287. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1288. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1289. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  1290. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1291. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1292. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1293. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1294. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1295. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1296. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  1297. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1298. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1299. =======
  1300. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1301. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1302. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1303. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1304. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1305. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1306. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1307. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1308. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  1309. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1310. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
  1311. =======
  1312. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
  1313. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
  1314. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
  1315. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1316. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
  1317. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1318. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  1319. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1320. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
  1321. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1322. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  1323. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
  1324. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1325. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
  1326. =======
  1327. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1328. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1329. =======
  1330. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1331. >>>>>>> 94841b5 (Featire specs) =======
  1332. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1333. =======
  1334. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1335. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  1336. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1337. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1338. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1339. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  1340. =======
  1341. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  1342. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1343. >>>>>>> e54deeb (Featire specs) =======
  1344. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1345. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1346. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1347. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1348. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1349. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1350. =======
  1351. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1352. >>>>>>> 9c0d812 (Featire specs) =======
  1353. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1354. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1355. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  1356. =======
  1357. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1358. >>>>>>> 9c0d812 (Featire specs) =======
  1359. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1360. =======
  1361. >>>>>>> 9c0d812 (Featire specs) =======
  1362. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
  1363. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1364. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1365. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  1366. =======
  1367. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1368. >>>>>>> 94841b5 (Featire specs) =======
  1369. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1370. >>>>>>> 3b03895 (Featire specs) =======
  1371. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1372. >>>>>>> e54deeb (Featire specs) =======
  1373. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1374. >>>>>>> 9c0d812 (Featire specs) =======
  1375. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1376. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  1377. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
  1378. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1379. =======
  1380. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1381. >>>>>>> 9c0d812 (Featire specs) =======
  1382. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1383. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
  1384. =======
  1385. >>>>>>> 752f0c0 (Featire specs) =======
  1386. >>>>>>> 4e81ea2 (Featire specs) =======
  1387. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  1388. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1389. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1390. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
  1391. =======
  1392. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
  1393. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1394. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
  1395. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1396. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  1397. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1398. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1399. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1400. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1401. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1402. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1403. =======
  1404. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1405. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1406. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1407. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1408. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1409. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1410. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1411. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1412. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  1413. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1414. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1415. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1416. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1417. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1418. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1419. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  1420. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1421. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1422. =======
  1423. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1424. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1425. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1426. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1427. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1428. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1429. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1430. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1431. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  1432. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1433. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
  1434. =======
  1435. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
  1436. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
  1437. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
  1438. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1439. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
  1440. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1441. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  1442. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1443. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
  1444. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1445. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  1446. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
  1447. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1448. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
  1449. =======
  1450. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1451. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1452. =======
  1453. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1454. >>>>>>> 94841b5 (Featire specs) =======
  1455. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1456. =======
  1457. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1458. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  1459. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1460. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1461. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1462. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  1463. =======
  1464. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  1465. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1466. >>>>>>> e54deeb (Featire specs) =======
  1467. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1468. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1469. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1470. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1471. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1472. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1473. =======
  1474. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1475. >>>>>>> 9c0d812 (Featire specs) =======
  1476. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1477. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1478. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  1479. =======
  1480. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1481. >>>>>>> 9c0d812 (Featire specs) =======
  1482. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1483. =======
  1484. >>>>>>> 9c0d812 (Featire specs) =======
  1485. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
  1486. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1487. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1488. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  1489. =======
  1490. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1491. >>>>>>> 94841b5 (Featire specs) =======
  1492. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1493. >>>>>>> 3b03895 (Featire specs) =======
  1494. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1495. >>>>>>> e54deeb (Featire specs) =======
  1496. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1497. >>>>>>> 9c0d812 (Featire specs) =======
  1498. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1499. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  1500. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
  1501. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1502. =======
  1503. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1504. >>>>>>> 9c0d812 (Featire specs) =======
  1505. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1506. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
  1507. =======
  1508. >>>>>>> 752f0c0 (Featire specs) =======
  1509. >>>>>>> 4e81ea2 (Featire specs) =======
  1510. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  1511. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1512. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1513. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
  1514. =======
  1515. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
  1516. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1517. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
  1518. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1519. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  1520. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1521. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1522. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1523. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1524. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1525. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1526. =======
  1527. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1528. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1529. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1530. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1531. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1532. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1533. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1534. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1535. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  1536. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1537. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1538. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1539. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1540. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1541. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1542. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  1543. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1544. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1545. =======
  1546. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1547. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1548. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1549. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1550. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1551. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1552. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1553. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1554. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  1555. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1556. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
  1557. =======
  1558. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
  1559. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
  1560. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
  1561. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1562. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
  1563. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1564. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  1565. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1566. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
  1567. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1568. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  1569. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
  1570. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1571. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
  1572. =======
  1573. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1574. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1575. =======
  1576. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1577. >>>>>>> 94841b5 (Featire specs) =======
  1578. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1579. =======
  1580. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1581. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  1582. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1583. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1584. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1585. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  1586. =======
  1587. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  1588. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1589. >>>>>>> e54deeb (Featire specs) =======
  1590. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1591. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1592. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1593. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1594. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1595. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1596. =======
  1597. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1598. >>>>>>> 9c0d812 (Featire specs) =======
  1599. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1600. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1601. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  1602. =======
  1603. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1604. >>>>>>> 9c0d812 (Featire specs) =======
  1605. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1606. =======
  1607. >>>>>>> 9c0d812 (Featire specs) =======
  1608. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
  1609. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1610. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1611. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  1612. =======
  1613. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1614. >>>>>>> 94841b5 (Featire specs) =======
  1615. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1616. >>>>>>> 3b03895 (Featire specs) =======
  1617. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1618. >>>>>>> e54deeb (Featire specs) =======
  1619. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1620. >>>>>>> 9c0d812 (Featire specs) =======
  1621. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1622. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  1623. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
  1624. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1625. =======
  1626. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1627. >>>>>>> 9c0d812 (Featire specs) =======
  1628. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1629. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
  1630. =======
  1631. >>>>>>> 752f0c0 (Featire specs) =======
  1632. >>>>>>> 4e81ea2 (Featire specs) =======
  1633. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  1634. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1635. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1636. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
  1637. =======
  1638. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
  1639. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1640. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
  1641. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1642. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  1643. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1644. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1645. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1646. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1647. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1648. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1649. =======
  1650. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1651. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1652. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1653. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1654. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1655. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1656. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1657. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1658. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  1659. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1660. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1661. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1662. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1663. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1664. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1665. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  1666. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1667. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1668. =======
  1669. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1670. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1671. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1672. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1673. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1674. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1675. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1676. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1677. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  1678. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1679. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
  1680. =======
  1681. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
  1682. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
  1683. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
  1684. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1685. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
  1686. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1687. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  1688. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1689. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 def show
  1690. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1691. 11 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1692. 11 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) =======
  1693. 11 ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
  1694. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  1695. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1696. =======
  1697. >>>>>>> 752f0c0 (Featire specs) =======
  1698. >>>>>>> 4e81ea2 (Featire specs) =======
  1699. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) >>>>>>> 4a2f2ad8 (Featire specs)
  1700. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1701. 11 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  1702. 11 =======
  1703. 11 >>>>>>> 9620751 (Featire specs) =======
  1704. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
  1705. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  1706. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  1707. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  1708. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1709. =======
  1710. >>>>>>> 752f0c0 (Featire specs) =======
  1711. >>>>>>> 4e81ea2 (Featire specs) =======
  1712. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
  1713. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1714. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1715. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) =======
  1716. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) =======
  1717. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) =======
  1718. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) =======
  1719. 15 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  1720. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1721. =======
  1722. >>>>>>> 752f0c0 (Featire specs) =======
  1723. >>>>>>> 4e81ea2 (Featire specs) =======
  1724. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
  1725. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) book = Book.find(params[:id]) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
  1726. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1727. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= =======
  1728. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
  1729. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1730. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs)
  1731. 11 =======
  1732. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= =======
  1733. 7 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= =======
  1734. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  1735. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  1736. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1737. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  1738. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1739. 11 >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD book = Book.find(params[:id]) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1740. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1741. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= =======
  1742. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
  1743. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1744. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
  1745. 11 >>>>>>> c033601 (Rebased) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  1746. 11 =======
  1747. 11 >>>>>>> 9620751 (Featire specs) =======
  1748. 11 >>>>>>> 2a25e4c (Featire specs) =======
  1749. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  1750. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  1751. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  1752. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
  1753. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1754. =======
  1755. >>>>>>> 752f0c0 (Featire specs) =======
  1756. >>>>>>> 4e81ea2 (Featire specs) =======
  1757. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1758. 7 >>>>>>> 7a02bbe (Featire specs) =======
  1759. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  1760. 7 >>>>>>> 4552227 (Featire specs) =======
  1761. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) =======
  1762. 15 >>>>>>> 7c4ea7f (Fix) book = Book.find(params[:id]) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
  1763. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  1764. 7 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e6fc67c7 (Featire specs) =======
  1765. 11 <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1766. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= =======
  1767. 7 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= =======
  1768. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  1769. 7 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= =======
  1770. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1771. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD book = Book.find_by(id: params[:id]) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD book = Book.find_by(id: params[:id]) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) @book = Book.find(params[:id]).decorate ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) ======= @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= @book = Book.find(params[:id]).decorate ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD book = Book.find_by(id: params[:id]) ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= @book = Book.find(params[:id]).decorate ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) @book = Book.find(params[:id]).decorate ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) book = Book.find_by(id: params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) book = Book.find(params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= book = Book.find_by(id: params[:id]) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) book = Book.find(params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) book = Book.find(params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
  1772. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1773. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  1774. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
  1775. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1776. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
  1777. =======
  1778. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1779. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1780. =======
  1781. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1782. >>>>>>> 94841b5 (Featire specs) =======
  1783. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1784. =======
  1785. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1786. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  1787. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1788. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1789. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1790. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  1791. =======
  1792. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  1793. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1794. >>>>>>> e54deeb (Featire specs) =======
  1795. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1796. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1797. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1798. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1799. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1800. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1801. =======
  1802. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1803. >>>>>>> 9c0d812 (Featire specs) =======
  1804. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1805. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1806. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  1807. =======
  1808. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1809. >>>>>>> 9c0d812 (Featire specs) =======
  1810. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1811. =======
  1812. >>>>>>> 9c0d812 (Featire specs) =======
  1813. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
  1814. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1815. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1816. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  1817. =======
  1818. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1819. >>>>>>> 94841b5 (Featire specs) =======
  1820. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1821. >>>>>>> 3b03895 (Featire specs) =======
  1822. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1823. >>>>>>> e54deeb (Featire specs) =======
  1824. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1825. >>>>>>> 9c0d812 (Featire specs) =======
  1826. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1827. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  1828. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
  1829. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1830. =======
  1831. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1832. >>>>>>> 9c0d812 (Featire specs) =======
  1833. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1834. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
  1835. =======
  1836. >>>>>>> 752f0c0 (Featire specs) =======
  1837. >>>>>>> 4e81ea2 (Featire specs) =======
  1838. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  1839. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1840. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1841. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
  1842. =======
  1843. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
  1844. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1845. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
  1846. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  1847. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  1848. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1849. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1850. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1851. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1852. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1853. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1854. =======
  1855. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1856. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1857. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1858. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1859. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1860. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1861. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1862. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1863. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  1864. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1865. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1866. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1867. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1868. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1869. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1870. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  1871. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1872. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1873. =======
  1874. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1875. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1876. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1877. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1878. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1879. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1880. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1881. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1882. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  1883. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1884. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
  1885. =======
  1886. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
  1887. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
  1888. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
  1889. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1890. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
  1891. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  1892. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  1893. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1894. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
  1895. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1896. 11 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1897. 11 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) =======
  1898. 11 ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
  1899. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  1900. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1901. =======
  1902. >>>>>>> 752f0c0 (Featire specs) =======
  1903. >>>>>>> 4e81ea2 (Featire specs) =======
  1904. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) >>>>>>> 4a2f2ad8 (Featire specs)
  1905. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1906. 11 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  1907. 11 =======
  1908. 11 >>>>>>> 9620751 (Featire specs) =======
  1909. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
  1910. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  1911. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1912. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  1913. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1914. =======
  1915. >>>>>>> 752f0c0 (Featire specs) =======
  1916. >>>>>>> 4e81ea2 (Featire specs) =======
  1917. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
  1918. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  1919. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1920. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  1921. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1922. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
  1923. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1924. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> fdab719f (Fix) ======= =======
  1925. 7 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1926. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  1927. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1928. =======
  1929. >>>>>>> 752f0c0 (Featire specs) =======
  1930. >>>>>>> 4e81ea2 (Featire specs) =======
  1931. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
  1932. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1933. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1934. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  1935. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1936. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
  1937. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1938. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
  1939. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
  1940. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
  1941. 15 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
  1942. 11 >>>>>>> c033601 (Rebased) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  1943. 11 =======
  1944. 11 >>>>>>> 9620751 (Featire specs) =======
  1945. 11 >>>>>>> 2a25e4c (Featire specs) =======
  1946. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  1947. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  1948. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  1949. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
  1950. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1951. =======
  1952. >>>>>>> 752f0c0 (Featire specs) =======
  1953. >>>>>>> 4e81ea2 (Featire specs) =======
  1954. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  1955. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1956. 7 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1957. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1958. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1959. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= =======
  1960. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= =======
  1961. 15 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= =======
  1962. 7 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= ======= =======
  1963. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  1964. 7 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= =======
  1965. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1966. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1967. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1968. 15 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  1969. 11 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if book.nil? ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) if book.nil? ======= redirect_to books_path if @book.nil? >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= if book.nil? >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= if book.nil? >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= if book.nil? >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= if book.nil? >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= if book.nil? >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if book.nil? >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
  1970. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs)
  1971. >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
  1972. ======= >>>>>>> 824bb2b (Featire specs) =======
  1973. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs)
  1974. =======
  1975. >>>>>>> 752f0c0 (Featire specs) =======
  1976. >>>>>>> 4e81ea2 (Featire specs) =======
  1977. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  1978. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix)
  1979. redirect_to books_path
  1980. else
  1981. 15 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc)) ======= ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  1982. 15 >>>>>>> a5d032d (Fix) @book = book.decorate >>>>>>> e18eb87 (Fix)
  1983. <<<<<<< HEAD
  1984. 11 >>>>>>> a5d032d (Fix) @book = book.decorate ======= ======= >>>>>>> c4adab0 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= @book = book.decorate >>>>>>> 6da9530 (Featire specs)
  1985. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD
  1986. =======
  1987. >>>>>>> a5d032d (Fix) <<<<<<< HEAD =======
  1988. >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) end
  1989. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1990. <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs)
  1991. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs)
  1992. =======
  1993. >>>>>>> 752f0c0 (Featire specs) =======
  1994. >>>>>>> 4e81ea2 (Featire specs) =======
  1995. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  1996. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
  1997. redirect_to books_path
  1998. else
  1999. 11 <<<<<<< HEAD ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  2000. 11 >>>>>>> a5d032d (Fix) @book = book.decorate ======= ======= >>>>>>> c4adab0 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= if book.nil? >>>>>>> c7a726c5 (Rebased)
  2001. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  2002. =======
  2003. >>>>>>> a5d032d (Fix) end
  2004. <<<<<<< HEAD
  2005. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price)
  2006. >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix)
  2007. >>>>>>> b904d7ae (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  2008. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  2009. =======
  2010. >>>>>>> 752f0c0 (Featire specs) =======
  2011. >>>>>>> 4e81ea2 (Featire specs) =======
  2012. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2013. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
  2014. redirect_to books_path
  2015. else
  2016. <<<<<<< HEAD <<<<<<< HEAD
  2017. 15 =======
  2018. 11 >>>>>>> c7a726c5 (Rebased) =======
  2019. 15 >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  2020. <<<<<<< HEAD <<<<<<< HEAD
  2021. 15 =======
  2022. 11 >>>>>>> 31d15e66 (Fix) =======
  2023. 15 >>>>>>> ef483b6d (Fix) >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) @book = book.decorate
  2024. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix)
  2025. =======
  2026. >>>>>>> a5d032d (Fix) <<<<<<< HEAD =======
  2027. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) end
  2028. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)
  2029. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  2030. <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
  2031. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
  2032. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  2033. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  2034. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  2035. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e18eb87 (Fix) ======= =======
  2036. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  2037. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  2038. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  2039. <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  2040. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2041. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2042. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2043. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2044. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2045. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  2046. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  2047. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  2048. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  2049. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  2050. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  2051. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2052. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  2053. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= =======
  2054. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  2055. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  2056. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  2057. <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  2058. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2059. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2060. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2061. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2062. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2063. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  2064. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  2065. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  2066. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  2067. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  2068. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  2069. <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  2070. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= =======
  2071. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
  2072. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
  2073. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= =======
  2074. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
  2075. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  2076. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
  2077. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  2078. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  2079. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  2080. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
  2081. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  2082. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  2083. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
  2084. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  2085. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
  2086. ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  2087. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  2088. =======
  2089. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  2090. >>>>>>> 94841b5 (Featire specs) =======
  2091. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  2092. =======
  2093. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  2094. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  2095. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  2096. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  2097. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  2098. >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  2099. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  2100. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  2101. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  2102. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  2103. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  2104. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  2105. =======
  2106. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  2107. >>>>>>> 9c0d812 (Featire specs) =======
  2108. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  2109. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  2110. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  2111. ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
  2112. ======= =======
  2113. =======
  2114. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  2115. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  2116. >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  2117. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  2118. >>>>>>> 9c0d812 (Featire specs) =======
  2119. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  2120. =======
  2121. >>>>>>> 9c0d812 (Featire specs) =======
  2122. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
  2123. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  2124. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  2125. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  2126. =======
  2127. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  2128. >>>>>>> 94841b5 (Featire specs) =======
  2129. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  2130. >>>>>>> 3b03895 (Featire specs) =======
  2131. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  2132. >>>>>>> e54deeb (Featire specs) =======
  2133. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  2134. >>>>>>> 9c0d812 (Featire specs) =======
  2135. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  2136. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  2137. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
  2138. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  2139. =======
  2140. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  2141. >>>>>>> 9c0d812 (Featire specs) =======
  2142. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  2143. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
  2144. =======
  2145. >>>>>>> 752f0c0 (Featire specs) =======
  2146. >>>>>>> 4e81ea2 (Featire specs) =======
  2147. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  2148. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  2149. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  2150. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  2151. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  2152. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
  2153. =======
  2154. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
  2155. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  2156. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
  2157. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
  2158. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
  2159. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  2160. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  2161. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  2162. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  2163. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  2164. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  2165. =======
  2166. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2167. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  2168. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  2169. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  2170. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  2171. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  2172. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  2173. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  2174. end

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 class CouponsController < ApplicationController
  3. 1 def find
  4. 4 coupon = Coupon.find_by(code: params[:code])
  5. 4 order = Order.find(session[:order_id])
  6. 4 respond_to do |format|
  7. 4 format.json do
  8. 4 render json: CouponService.find_coupon(params, order, coupon)
  9. end
  10. end
  11. end
  12. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  13. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  14. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  15. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  16. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  17. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  18. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  19. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  20. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  21. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  22. =======
  23. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  24. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  25. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  27. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  28. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  29. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  30. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  31. end

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 class CouponsController < ApplicationController
  3. 1 def find
  4. 4 coupon = Coupon.find_by(code: params[:code])
  5. 4 order = Order.find(session[:order_id])
  6. 4 respond_to do |format|
  7. 4 format.json do
  8. 4 render json: CouponService.find_coupon(params, order, coupon)
  9. end
  10. end
  11. end
  12. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  13. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  14. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  15. =======
  16. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
  17. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
  18. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
  19. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  20. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
  21. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  22. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  23. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  24. end

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 class CouponsController < ApplicationController
  3. 1 def find
  4. 4 coupon = Coupon.find_by(code: params[:code])
  5. 4 order = Order.find(session[:order_id])
  6. 4 respond_to do |format|
  7. 4 format.json do
  8. 4 render json: CouponService.find_coupon(params, order, coupon)
  9. end
  10. end
  11. end
  12. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end

app/controllers/home_controller.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 class HomeController < ApplicationController
  2. 1 def index
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  5. 13 =======
  6. 3 >>>>>>> d0dc1f1 (Featire specs) =======
  7. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
  8. 13 =======
  9. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs)
  10. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  11. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) =======
  12. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
  13. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) =======
  14. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) =======
  15. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) =======
  16. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
  17. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= ======= ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) =======
  18. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) =======
  19. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) =======
  20. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) =======
  21. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
  22. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
  23. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
  24. 13 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  25. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
  26. 3 >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs)
  27. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  28. 13 >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  29. 13 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD
  30. 3 >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs)
  31. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  32. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= =======
  33. 3 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) =======
  34. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  35. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  36. 13 >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  37. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  38. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  39. 13 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 72b9cab (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e18eb87 (Fix) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
  40. <<<<<<< HEAD <<<<<<< HEAD
  41. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
  42. 13 =======
  43. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
  44. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  45. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) =======
  46. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
  47. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) =======
  48. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  49. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) =======
  50. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) =======
  51. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> 53db2224 (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  52. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  53. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  54. 13 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  55. 13 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  56. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  57. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  58. 13 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
  59. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
  60. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  61. 13 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) @best_sellers = best_sellers
  62. end
  63. 1 private
  64. 1 def best_sellers
  65. <<<<<<< HEAD <<<<<<< HEAD
  66. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  67. 13 =======
  68. 3 >>>>>>> d0dc1f1 (Featire specs) =======
  69. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(4)) >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
  70. 13 =======
  71. 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs)
  72. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix)
  73. 3 >>>>>>> 4e81ea2 (Featire specs) =======
  74. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) =======
  75. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) =======
  76. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) =======
  77. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
  78. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= ======= ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) =======
  79. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) =======
  80. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) =======
  81. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) =======
  82. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
  83. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
  84. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
  85. 13 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  86. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
  87. 3 >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs)
  88. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  89. 13 >>>>>>> a5d032d (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  90. 13 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD
  91. 3 >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs)
  92. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  93. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= =======
  94. 3 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) =======
  95. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  96. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  97. 13 >>>>>>> a5d032d (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  98. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  99. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  100. 13 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> 2ee03d3 (Featire specs) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= Book.first(4) >>>>>>> 752f0c0 (Featire specs) ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) ======= Book.first(4) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= Book.first(4) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= Book.first(4) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.first(4) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.first(4) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.first(4) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.first(4) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= Book.first(4) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= Book.first(4) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
  101. end
  102. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======

app/controllers/order_books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD 80.65% ======= 90.32% >>>>>>> ef483b6d (Fix) ======= 80.65% >>>>>>> d68e8240 (Fix) lines covered

31 relevant lines. <<<<<<< HEAD <<<<<<< HEAD 25 lines covered and 6 lines missed. ======= 28 lines covered and 3 lines missed. >>>>>>> ef483b6d (Fix) ======= 25 lines covered and 6 lines missed. >>>>>>> d68e8240 (Fix)
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 require_relative '../services/book_service'
  3. 1 class OrderBooksController < ApplicationController
  4. 1 before_action :update_order_last_action
  5. 1 def add_to_order
  6. 4 product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
  7. 4 respond_to do |format|
  8. 4 format.html
  9. 4 format.json do
  10. 4 if product.save
  11. 4 render json: { notice: 'Added!' }
  12. else
  13. render json: { notice: 'Error!' }
  14. end
  15. end
  16. end
  17. end
  18. 1 def delete_product
  19. <<<<<<< HEAD <<<<<<< HEAD
  20. =======
  21. 1 >>>>>>> ef483b6d (Fix) =======
  22. >>>>>>> d68e8240 (Fix) product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  23. <<<<<<< HEAD <<<<<<< HEAD
  24. =======
  25. 1 >>>>>>> ef483b6d (Fix) =======
  26. >>>>>>> d68e8240 (Fix) if product.destroy
  27. <<<<<<< HEAD <<<<<<< HEAD
  28. =======
  29. 1 >>>>>>> ef483b6d (Fix) =======
  30. >>>>>>> d68e8240 (Fix) redirect_to orders_path, notice: I18n.t('order.messages.delete')
  31. else
  32. redirect_to orders_path, alert: I18n.t('order.errors.error_delete')
  33. end
  34. end
  35. 1 def update_quantity
  36. 2 product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  37. 2 book = Book.find(params[:book_id])
  38. 2 order = Order.find(params[:order_id])
  39. 2 coupon = Coupon.find_by(code: params[:code])
  40. 2 respond_to do |format|
  41. 2 format.html
  42. 2 format.json do
  43. 2 render json: BookService.quantity_update(params, product, order, book, coupon)
  44. end
  45. end
  46. end
  47. 1 private
  48. 1 def order_item_params
  49. params.permit(%i[book_id quantity order_id])
  50. end
  51. 1 def update_order_last_action
  52. <<<<<<< HEAD <<<<<<< HEAD
  53. 6 =======
  54. 7 >>>>>>> ef483b6d (Fix) =======
  55. 6 >>>>>>> d68e8240 (Fix) Order.find(session[:order_id]).update(last_action: DateTime.now)
  56. end
  57. end

app/controllers/orders_controller.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class OrdersController < ApplicationController
  2. 1 def index
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. 7 =======
  5. 8 >>>>>>> ef483b6d (Fix) =======
  6. 7 >>>>>>> d68e8240 (Fix) @cart = Order.find(session[:order_id]).decorate
  7. end
  8. 1 def registration_without_password; end
  9. end
>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix)

app/controllers/reviews_controller.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 10 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> c7a726c5 (Rebased) ======= 10 relevant lines. 10 lines covered and >>>>>>> fdab719f (Fix) 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 <<<<<<< HEAD <<<<<<< HEAD if @review.save ======= return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save >>>>>>> c7a726c5 (Rebased) ======= if @review.save >>>>>>> fdab719f (Fix)
  6. <<<<<<< HEAD <<<<<<< HEAD
  7. =======
  8. >>>>>>> c7a726c5 (Rebased) =======
  9. >>>>>>> fdab719f (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD redirect_to book_path(@review.book), notice: I18n.t('review.success') ======= redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ') >>>>>>> c7a726c5 (Rebased) ======= redirect_to book_path(@review.book), notice: I18n.t('review.success') >>>>>>> fdab719f (Fix)
  10. <<<<<<< HEAD <<<<<<< HEAD
  11. =======
  12. >>>>>>> c7a726c5 (Rebased) =======
  13. >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) else
  14. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ') <<<<<<< HEAD ======= end >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix)
  15. <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> c7a726c5 (Rebased) ======= end >>>>>>> fdab719f (Fix)
  16. <<<<<<< HEAD <<<<<<< HEAD
  17. =======
  18. 1 >>>>>>> c7a726c5 (Rebased) =======
  19. >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD end ======= private >>>>>>> c7a726c5 (Rebased) ======= end >>>>>>> fdab719f (Fix)
  20. 1 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) private
  21. 1 <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) def review_params
  22. <<<<<<< HEAD <<<<<<< HEAD
  23. =======
  24. >>>>>>> c7a726c5 (Rebased) =======
  25. >>>>>>> fdab719f (Fix) 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  26. <<<<<<< HEAD <<<<<<< HEAD
  27. =======
  28. >>>>>>> c7a726c5 (Rebased) =======
  29. >>>>>>> fdab719f (Fix) end
  30. <<<<<<< HEAD <<<<<<< HEAD
  31. =======
  32. >>>>>>> c7a726c5 (Rebased) =======
  33. >>>>>>> fdab719f (Fix) end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e18eb87 (Fix)

app/decorators/author_decorator.rb

<<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
  6. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  7. end
  8. 1 private
  9. 1 def review_params
  10. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  11. end
  12. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
<<<<<<< HEAD

app/controllers/order_books_controller.rb

80.65% lines covered

31 relevant lines. 25 lines covered and 6 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 require_relative '../services/book_service'
  3. 1 class OrderBooksController < ApplicationController
  4. 1 before_action :update_order_last_action
  5. 1 def add_to_order
  6. 4 product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
  7. 4 respond_to do |format|
  8. 4 format.html
  9. 4 format.json do
  10. 4 if product.save
  11. 4 render json: { notice: 'Added!' }
  12. else
  13. render json: { notice: 'Error!' }
  14. end
  15. end
  16. end
  17. end
  18. 1 def delete_product
  19. product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  20. if product.destroy
  21. redirect_to orders_path, notice: I18n.t('order.messages.delete')
  22. else
  23. redirect_to orders_path, alert: I18n.t('order.errors.error_delete')
  24. end
  25. end
  26. 1 def update_quantity
  27. 2 product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  28. 2 book = Book.find(params[:book_id])
  29. 2 order = Order.find(params[:order_id])
  30. 2 coupon = Coupon.find_by(code: params[:code])
  31. 2 respond_to do |format|
  32. 2 format.html
  33. 2 format.json do
  34. 2 render json: BookService.quantity_update(params, product, order, book, coupon)
  35. end
  36. end
  37. end
  38. 1 private
  39. 1 def order_item_params
  40. params.permit(%i[book_id quantity order_id])
  41. end
  42. 1 def update_order_last_action
  43. 6 Order.find(session[:order_id]).update(last_action: DateTime.now)
  44. end
  45. end

app/controllers/orders_controller.rb

=======

app/decorators/author_decorator.rb

<<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD class OrdersController < ApplicationController ======= <<<<<<< HEAD <<<<<<< HEAD class AuthorDecorator < Draper::Decorator ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class AuthorDecorator < Draper::Decorator ======= module ApplicationHelper >>>>>>> 752f0c0 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> bd8bda4 (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)
  2. 1 <<<<<<< HEAD def index
  3. 7 @cart = Order.find(session[:order_id]).decorate
  4. end
  5. 1 def registration_without_password; end
  6. end
>>>>>>> 7c4ea7f (Fix)

app/controllers/reviews_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 if @review.save
  6. 1 redirect_to book_path(@review.book), notice: I18n.t('review.success')
  7. else
  8. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  9. end
  10. end
  11. 1 private
  12. 1 def review_params
  13. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  14. end
  15. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
  6. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  7. end
  8. 1 private
  9. 1 def review_params
  10. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  11. end
  12. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> e055dd0 (Rebased) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> 02a399d (Manifest_cache true) =======
>>>>>>> bd8bda4 (Manifest_cache true) =======
>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d365be68 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased)
>>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= =======

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======

app/decorators/author_decorator.rb

>>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= =======

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) =======
>>>>>>> bd8bda4 (Manifest_cache true) =======
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) class AuthorDecorator < Draper::Decorator >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) class AuthorDecorator < Draper::Decorator >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class AuthorDecorator < Draper::Decorator ======= module ApplicationHelper >>>>>>> 752f0c0 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> bd8bda4 (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= module ApplicationHelper >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= class AuthorDecorator < Draper::Decorator >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= module ApplicationHelper >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= module ApplicationHelper >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= module ApplicationHelper >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a2f2ad8 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) delegate_all
  3. 1 def full_name
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix)
  5. 3 <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  6. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD
  7. ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  8. ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true)
  9. ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 7c4ea7f (Fix)
  10. 3 <<<<<<< HEAD <<<<<<< HEAD =======
  11. 3 >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 9e081dc (Fix) =======
  12. 2 >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  13. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
  14. 2 >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) =======
  15. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  16. 2 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
  17. 2 >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  18. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  19. 3 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 99dad91f (Fix) =======
  20. 2 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) >>>>>>> 450f4e3 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) =======
  21. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) =======
  22. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
  23. 3 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  24. 3 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  25. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  26. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
  27. 3 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= =======
  28. 3 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) "#{first_name} #{last_name}"
  29. end
  30. end

app/decorators/book_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) 100.0% <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 90.0% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) 100.0% ======= 90.0% >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 90.0% >>>>>>> bd8bda4 (Manifest_cache true) ======= 90.0% >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 90.0% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 99dad91f (Fix) ======= 90.0% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= 100.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 100.0% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 100.0% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= 100.0% >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) lines covered

<<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 1049b80c (Fix) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) 10 relevant lines. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 9 lines covered and 1 lines missed. ======= <<<<<<< HEAD 10 lines covered and 0 lines missed. ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 9 lines covered and 1 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> aa7b40c (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) ======= 10 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 31d15e66 (Fix) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)
    
  1. 1 require 'monetize'
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  3. =======
  4. 1 <<<<<<< HEAD ======= ======= ======= >>>>>>> ebcdce06 (Featire specs)
  5. =======
  6. 1 decorates_association :authors <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  7. 1 <<<<<<< HEAD decorates_association :categories ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :categories ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= decorates_association :categories >>>>>>> bd8bda4 (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) ======= decorates_association :categories >>>>>>> aa7b40c (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  8. >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 450f4e3 (Manifest_cache true)
  9. =======
  10. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= =======
  11. 1 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 450f4e3 (Manifest_cache true) =======
  12. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) =======
  13. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  14. >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) =======
  15. >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
  16. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) decorates_association :authors <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
  17. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) decorates_association :categories ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :categories ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= decorates_association :categories >>>>>>> bd8bda4 (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) ======= decorates_association :categories >>>>>>> aa7b40c (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> fd3f47ab (Featire specs) class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) class BookDecorator < Draper::Decorator ======= PAGINATION_PER_PAGE = 12 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ef483b6d (Fix) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix)
  18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  19. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  20. >>>>>>> 9bfbd88 (Featire specs) =======
  21. 1 decorates_association :authors
  22. >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
  23. 1 decorates_association :authors
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) =======
  25. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
  26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix)
  27. 1 class BookDecorator < Draper::Decorator ======= class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) class BookDecorator < Draper::Decorator ======= PAGINATION_PER_PAGE = 12 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
  28. 1 decorates_association :authors
  29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)
  30. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) def self.collection_decorator_class
  31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  32. ======= <<<<<<< HEAD
  33. 30 =======
  34. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
  35. >>>>>>> bd8bda4 (Manifest_cache true) =======
  36. >>>>>>> aa7b40c (Manifest_cache true) =======
  37. 31 >>>>>>> 1214e1f (Add login registration pages) =======
  38. >>>>>>> 183b6c5 (Manifest_cache true) =======
  39. 30 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
  40. 56 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  41. 31 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 73dcd461 (Add login registration pages)
  42. 56 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> bdc24a1a (Rebased)
  43. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) =======
  44. 58 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> aa3618b (Rebased) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) =======
  45. 58 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) PaginatingDecorator
  46. end
  47. 1 delegate_all
  48. 1 def authors_names
  49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  50. 1 ======= <<<<<<< HEAD
  51. 89 =======
  52. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  53. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  54. 1 >>>>>>> aa7b40c (Manifest_cache true) =======
  55. 90 >>>>>>> 1214e1f (Add login registration pages) =======
  56. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
  57. 89 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
  58. 101 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  59. 90 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  60. 101 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 11792758 (Rebased) =======
  61. =======
  62. >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  63. 105 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true)
  64. 58 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
  65. 109 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= =======
  66. 105 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) authors.map(&:full_name).join(', ')
  67. end
  68. 1 def categories_names
  69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  70. 12 =======
  71. 8 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
  72. 8 =======
  73. 12 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  74. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  75. 12 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  76. 12 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  77. 12 >>>>>>> e3e66f3 (Featire specs) =======
  78. >>>>>>> 11792758 (Rebased) =======
  79. 12 >>>>>>> 31d15e66 (Fix) categories.pluck(:name).join(', ')
  80. end <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  81. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs)
  82. 1 def price <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
  83. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs)
  84. 121 =======
  85. >>>>>>> 11792758 (Rebased) Money.new(price_cents)
  86. <<<<<<< HEAD =======
  87. >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) end
  88. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  89. 1 def price >>>>>>> 84809242 (Featire specs)
  90. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  91. 125 ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD
  92. 121 =======
  93. 125 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  94. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  95. 125 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  96. 125 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  97. 125 >>>>>>> e3e66f3 (Featire specs) =======
  98. 144 >>>>>>> 5b7749a (Fix) =======
  99. 143 >>>>>>> 366b257 (Fix) =======
  100. 125 >>>>>>> 31d15e66 (Fix) Money.new(price_cents)
  101. end
  102. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======

app/decorators/order_book_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 require 'monetize'
  2. 1 class OrderBookDecorator < Draper::Decorator
  3. 1 delegate_all
  4. 1 def total_price
  5. 8 Money.new(book.price_cents * quantity)
  6. end
  7. end

app/decorators/order_decorator.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require 'monetize'
  2. 1 class OrderDecorator < Draper::Decorator
  3. 1 delegate_all
  4. 1 def order_price(coupon = 0)
  5. 27 total_price = 0
  6. 27 order_books.each do |order_book|
  7. 25 total_price += order_book.book.price_cents * order_book.quantity
  8. end
  9. 27 Money.new(total_price - (total_price * coupon))
  10. end
  11. end
>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  3. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  7. >>>>>>> bd8bda4 (Manifest_cache true) =======
  8. >>>>>>> aa7b40c (Manifest_cache true) =======
  9. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
  10. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs)

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  1. 1 class ReviewDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs)
  4. 1 def date_time
  5. 1 created_at.strftime('%m/%d/%Y')
  6. end
  7. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  9. 1 def date_time
  10. 1 created_at.strftime('%m/%d/%Y')
  11. end
  12. end
  13. >>>>>>> 84809242 (Featire specs)
<<<<<<< HEAD =======

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 100.0% <<<<<<< HEAD ======= ======= 100.0% >>>>>>> 872e675 (Fix) ======= 100.0% >>>>>>> 0d6dd12 (Manifest_cache true) ======= 100.0% >>>>>>> e3e66f3 (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= 2 relevant lines. 2 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 2 relevant lines. 2 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class PaginatingDecorator < Draper::CollectionDecorator ======= module ApplicationHelper <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> c8da2e3 (Fix) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> 0d6dd12 (Manifest_cache true) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> e3e66f3 (Featire specs)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> 872e675 (Fix) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> 0d6dd12 (Manifest_cache true) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> e3e66f3 (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  4. end

app/decorators/review_decorator.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= 75.0% >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

4 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 3 lines covered and <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= 4 lines covered and >>>>>>> 872e675 (Fix) ======= 4 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 4 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD class ReviewDecorator < Draper::Decorator >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= class ReviewDecorator < Draper::Decorator >>>>>>> 872e675 (Fix) ======= class ReviewDecorator < Draper::Decorator >>>>>>> 0d6dd12 (Manifest_cache true) ======= class ReviewDecorator < Draper::Decorator >>>>>>> e3e66f3 (Featire specs)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD delegate_all >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= delegate_all >>>>>>> 872e675 (Fix) ======= delegate_all >>>>>>> 0d6dd12 (Manifest_cache true) ======= delegate_all >>>>>>> e3e66f3 (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def full_name ======= def date_time >>>>>>> b28889f (Fix) ======= def date_time >>>>>>> 872e675 (Fix) ======= def date_time >>>>>>> 0d6dd12 (Manifest_cache true) ======= def date_time >>>>>>> e3e66f3 (Featire specs)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  6. 2 =======
  7. 1 >>>>>>> b28889f (Fix) =======
  8. 1 >>>>>>> 872e675 (Fix) =======
  9. 1 >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  10. 1 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD "#{first_name} #{last_name}" ======= ======= >>>>>>> 5b7749a (Fix) created_at.strftime('%m/%d/%Y') >>>>>>> b28889f (Fix) ======= created_at.strftime('%m/%d/%Y') >>>>>>> 872e675 (Fix) ======= created_at.strftime('%m/%d/%Y') >>>>>>> 0d6dd12 (Manifest_cache true) ======= created_at.strftime('%m/%d/%Y') >>>>>>> e3e66f3 (Featire specs)
  11. end
  12. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

app/decorators/book_decorator.rb

90.0% ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

app/decorators/user_decorator.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= >>>>>>> 49e8a6c (Rebased) 1 lines missed. ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator
  2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  3. end

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. <<<<<<< HEAD <<<<<<< HEAD 4 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    
  1. 1 require 'image_processing'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :authors >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs)
  3. end

app/decorators/review_decorator.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) 0 lines missed.
    
  1. 1 module ApplicationHelper <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
  2. 1 <<<<<<< HEAD def markdown(text) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
  3. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 1 def full_name
  5. 2 "#{first_name} #{last_name}"
  6. end
  7. end

app/decorators/book_decorator.rb

90.0% ======= 100.0% >>>>>>> c7a726c5 (Rebased) lines covered

<<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= 4 relevant lines. <<<<<<< HEAD 3 lines covered and >>>>>>> 75fa7e1b (Rebased) 1 lines missed. ======= ======= >>>>>>> 31d15e66 (Fix) 4 lines covered and 0 lines missed.
    
  1. 1 class ReviewDecorator < Draper::Decorator <<<<<<< HEAD ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) module ApplicationHelper >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= module ApplicationHelper >>>>>>> 0d6dd12 (Manifest_cache true) ======= module ApplicationHelper >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
  3. 1 ======= =======
  4. 12 =======
  5. 1 >>>>>>> 49e8a6c (Rebased) =======
  6. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  7. 1 >>>>>>> e3e66f3 (Featire specs) =======
  8. 1 >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 49e8a6c (Rebased) ======= def markdown(text) >>>>>>> 0d6dd12 (Manifest_cache true) ======= def markdown(text) >>>>>>> e3e66f3 (Featire specs)
  9. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  10. =======
  11. 13 <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  12. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  13. 13 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  14. 13 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  15. 13 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) delegate_all
  16. 1 def date_time
  17. <<<<<<< HEAD <<<<<<< HEAD
  18. 1 =======
  19. 17 >>>>>>> 5b7749a (Fix) =======
  20. 1 >>>>>>> 31d15e66 (Fix) created_at.strftime('%m/%d/%Y') <<<<<<< HEAD ======= Markdown.new(text).to_html.html_safe >>>>>>> c8da2e3 (Fix) ======= Markdown.new(text).to_html.html_safe >>>>>>> 0d6dd12 (Manifest_cache true) ======= Markdown.new(text).to_html.html_safe >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix)
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) end
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
<<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 31d15e66 (Fix)

app/helpers/application_helper.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) 0 lines missed. >>>>>>> 67ab5299 (Fix)
    
  1. 1 <<<<<<< HEAD require 'image_processing'
  2. 1 ======= >>>>>>> 824bb2b (Featire specs) module ApplicationHelper
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs)
  4. 12 ======= ======= >>>>>>> 84809242 (Featire specs)
  5. =======
  6. >>>>>>> 824bb2b (Featire specs) 1 >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 75fa7e1b (Rebased) ======= def markdown(text) ======= <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs)
  7. <<<<<<< HEAD
  8. 13 ======= <<<<<<< HEAD
  9. 12 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD Markdown.new(text).to_html.html_safe ======= Markdown.new(text).to_html >>>>>>> 824bb2b (Featire specs)
  10. <<<<<<< HEAD
  11. =======
  12. >>>>>>> 824bb2b (Featire specs) end
  13. <<<<<<< HEAD
  14. =======
  15. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) end

app/helpers/constants.rb

100.0% lines covered

21 relevant lines. 21 lines covered and 0 lines missed.
    
  1. 1 module Constants
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) =======
  3. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  4. >>>>>>> 752f0c0 (Featire specs) =======
  5. >>>>>>> 4e81ea2 (Featire specs) =======
  6. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
  7. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  8. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  9. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
  10. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  11. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
  12. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 1 PAGINATION_PER_PAGE = 12 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD ======= decorates_association :categories >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= decorates_association :categories >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= decorates_association :categories >>>>>>> 02a399d (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
  13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs)
  14. ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  15. =======
  16. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
  17. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) =======
  18. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= =======
  19. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= =======
  20. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= =======
  21. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= =======
  22. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
  23. >>>>>>> 752f0c0 (Featire specs) =======
  24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  25. >>>>>>> 5b7749a (Fix)
  26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  27. 1 STAR_MIN = 0
  28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  29. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) STAR_MAX = 5
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  31. =======
  32. =======
  33. 30 =======
  34. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
  35. 31 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) PaginatingDecorator
  36. end
  37. >>>>>>> 02a399d (Manifest_cache true) =======
  38. >>>>>>> 5b7749a (Fix)
  39. 1 CATALOG_BOOK_COUNT = 3
  40. 1 BEST_SELLER_COUNT = 4
  41. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= delegate_all
  42. 1 def authors_names
  43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  44. 1 ======= <<<<<<< HEAD
  45. 89 =======
  46. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
  47. 90 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) authors.map(&:full_name).join(', ')
  48. end
  49. 1 def categories_names
  50. 1 categories.map(&:name).join(', ')
  51. end
  52. end

app/decorators/category_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class CategoryDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD ======= <<<<<<< HEAD end

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
  2. <<<<<<< HEAD
  3. ======= <<<<<<< HEAD
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. =======
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) end
  7. <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true)
  8. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper ======= >>>>>>> bd8bda4 (Manifest_cache true)
  2. 1 <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) DESCRIPTION_LENGTH = 25
  3. <<<<<<< HEAD
  4. 1 def full_name
  5. 2 "#{first_name} #{last_name}" <<<<<<< HEAD ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs)
  6. <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) end
  7. end

app/decorators/book_decorator.rb

90.0% lines covered

10 relevant lines. 9 lines covered and 1 lines missed. ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> c7a726c5 (Rebased)
    
  1. 1 require 'monetize'
  2. <<<<<<< HEAD
  3. 1 decorates_association :authors >>>>>>> bd8bda4 (Manifest_cache true)
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  5. 1 MIN_PRICE_IN_CENTS = 0
  6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD MAX_PRICE_IN_CENTS = 50_000 ======= MAX_PRICE_IN_CENTS = 10_000 >>>>>>> 824bb2b (Featire specs) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> 311e9fa (Rebased) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> 0d6dd12 (Manifest_cache true) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> e3e66f3 (Featire specs)
  7. =======
  8. >>>>>>> c7a726c5 (Rebased)
  9. <<<<<<< HEAD
  10. =======
  11. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
  12. 1 NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
  13. 1 COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
  14. 1 PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
  15. 1 ZIP_FORMAT = /\A[0-9]+\z/.freeze
  16. 1 VALIDATES_NAME_LENGTH_MAX = 50
  17. 1 VALIDATES_TEXT_LENGTH_MAX = 500
  18. 1 VALIDATES_TITLE_LENGTH_MAX = 80
  19. 1 VALIDATES_PHONE_LENGTH_MAX = 15
  20. 1 VALIDATES_ZIP_LENGTH_MAX = 10
  21. 1 FOOTER_NUMBER = '(555)-555-5555'.freeze
  22. 1 FOOTER_EMAIL = 'support@bookstore.com'.freeze
  23. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class BillingUpdate
  2. 1 include Interactor
  3. ======= class BookDecorator < Draper::Decorator >>>>>>> c7a726c5 (Rebased)
  4. 1 <<<<<<< HEAD def call ======= decorates_association :authors >>>>>>> c7a726c5 (Rebased)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  6. =======
  7. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) params = context.permitted_params ======= def self.collection_decorator_class >>>>>>> c7a726c5 (Rebased)
  8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased)
  9. ======= <<<<<<< HEAD
  10. 30 =======
  11. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  12. 31 >>>>>>> 1214e1f (Add login registration pages) =======
  13. >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD
  14. >>>>>>> 0d6dd12 (Manifest_cache true) =======
  15. >>>>>>> e3e66f3 (Featire specs) =======
  16. 30 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  17. 56 >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) PaginatingDecorator
  18. end
  19. 1 delegate_all
  20. 1 def authors_names
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  22. 1 ======= <<<<<<< HEAD
  23. 89 =======
  24. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
  25. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  26. 1 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 84003439 (Featire specs) =======
  27. 90 >>>>>>> 1214e1f (Add login registration pages) =======
  28. 1 >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD
  29. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  30. 1 >>>>>>> e3e66f3 (Featire specs) =======
  31. 89 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
  32. 101 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  33. 90 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
  34. 101 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 49e8a6c (Rebased) =======
  35. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) =======
  36. 105 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 9e081dc (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 9e081dc (Fix) ======= =======
  37. 109 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) authors.map(&:full_name).join(', ')
  38. end
  39. 1 def categories_names
  40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  41. 8 ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD
  42. 12 ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix)
  43. 8 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
  44. 8 =======
  45. 8 >>>>>>> e18eb87 (Fix) =======
  46. 12 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> e055dd0 (Rebased) =======
  47. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 0c57e4e (Fix) =======
  48. 12 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= =======
  49. 12 >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= =======
  50. 12 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
  51. 8 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) categories.pluck(:name).join(', ')
  52. end <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  53. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs)
  54. 1 def price <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
  55. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs)
  56. 121 Money.new(price_cents)
  57. <<<<<<< HEAD =======
  58. >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) end
  59. <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
  60. 1 def price
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  62. 125 ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> e75c983 (Fix)
  63. 121 =======
  64. 125 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) =======
  65. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) =======
  66. 125 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) =======
  67. 125 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  68. 125 >>>>>>> e3e66f3 (Featire specs) =======
  69. 144 >>>>>>> 5b7749a (Fix) =======
  70. 143 >>>>>>> 366b257 (Fix) =======
  71. 121 >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= =======
  72. 144 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= =======
  73. 143 >>>>>>> 851b4c0 (Fix) >>>>>>> e75c983 (Fix) Money.new(price_cents)
  74. end
  75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9e081dc (Fix) =======

app/decorators/order_book_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 require 'monetize'
  2. 1 class OrderBookDecorator < Draper::Decorator
  3. 1 delegate_all
  4. 1 def total_price
  5. <<<<<<< HEAD <<<<<<< HEAD
  6. 8 =======
  7. 9 >>>>>>> 9e081dc (Fix) =======
  8. 8 >>>>>>> e75c983 (Fix) Money.new(book.price_cents * quantity)
  9. end
  10. end

app/decorators/order_decorator.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require 'monetize'
  2. 1 class OrderDecorator < Draper::Decorator
  3. 1 delegate_all
  4. 1 def order_price(coupon = 0)
  5. <<<<<<< HEAD <<<<<<< HEAD
  6. 27 =======
  7. 29 >>>>>>> 9e081dc (Fix) =======
  8. 27 >>>>>>> e75c983 (Fix) total_price = 0
  9. <<<<<<< HEAD <<<<<<< HEAD
  10. 27 =======
  11. 29 >>>>>>> 9e081dc (Fix) =======
  12. 27 >>>>>>> e75c983 (Fix) order_books.each do |order_book|
  13. <<<<<<< HEAD <<<<<<< HEAD
  14. 25 =======
  15. 27 >>>>>>> 9e081dc (Fix) =======
  16. 25 >>>>>>> e75c983 (Fix) total_price += order_book.book.price_cents * order_book.quantity
  17. end
  18. <<<<<<< HEAD <<<<<<< HEAD
  19. 27 =======
  20. 29 >>>>>>> 9e081dc (Fix) =======
  21. 27 >>>>>>> e75c983 (Fix) Money.new(total_price - (total_price * coupon))
  22. end
  23. end
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  3. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs)
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  7. >>>>>>> bd8bda4 (Manifest_cache true) =======
  8. >>>>>>> aa7b40c (Manifest_cache true) =======
  9. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) end
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
  1. 1 class ReviewDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 1 def date_time
  5. 1 created_at.strftime('%m/%d/%Y')
  6. end
  7. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. ======= ======= >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
  9. 1 def date_time
  10. 1 <<<<<<< HEAD created_at.strftime('%m/%d/%Y') ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) def self.collection_decorator_class >>>>>>> 715fac2 (Featire specs)
  11. end
  12. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4552227 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased)
<<<<<<< HEAD
  • <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD end
  • <<<<<<< HEAD <<<<<<< HEAD

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. =======
    2. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= def price >>>>>>> c7a726c5 (Rebased)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. ======= <<<<<<< HEAD
    5. 1 =======
    6. 121 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= Money.new(price_cents) >>>>>>> c7a726c5 (Rebased)
    7. <<<<<<< HEAD
    8. =======
    9. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    10. >>>>>>> d782a28 (Manifest_cache true) end
    11. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    12. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 02a399d (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 =======
    5. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) "#{first_name} #{last_name}"
    6. =======
    7. >>>>>>> c7a726c5 (Rebased) end
    8. <<<<<<< HEAD
    9. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors ======= DESCRIPTION_LENGTH = 25 >>>>>>> d782a28 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 0d6dd12 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> e3e66f3 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4e81ea2 (Featire specs) ======= delegate_all
    3. 1 def full_name
    4. 3 "#{first_name} #{last_name}"
    5. end
    6. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> aa7b40c (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    4. 1 user = context.current_user
    5. 1 return if params[:billing].nil?
    6. 1 return if user.billing.update(params[:billing])
    7. context.fail!
    8. end
    9. end

    app/interactors/shipping_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed.
        
    1. 1 class ShippingUpdate
    2. 1 include Interactor
    3. 1 def call
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) params = context.permitted_params
    6. <<<<<<< HEAD
    7. PaginatingDecorator
    8. end
    9. 1 delegate_all
    10. 1 def authors_names
    11. 1 authors.map(&:full_name).join(', ')
    12. end
    13. 1 def categories_names
    14. 1 categories.map(&:name).join(', ')
    15. end
    16. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end
    ======= >>>>>>> 824bb2b (Featire specs)

    app/helpers/application_helper.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> 183b6c5 (Manifest_cache true)
    2. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 >>>>>>> aa7b40c (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs) ======= delegate_all
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}" ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4552227 (Featire specs)
    5. <<<<<<< HEAD end
    6. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and ======= 3 lines covered and >>>>>>> 11792758 (Rebased) 1 lines missed. ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) 0 lines missed. >>>>>>> 31d15e66 (Fix)
        
    1. 1 <<<<<<< HEAD require 'image_processing'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) module ApplicationHelper >>>>>>> 11792758 (Rebased)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix)
    4. 1 user = context.current_user
    5. 1 return if params[:shipping].nil?
    6. <<<<<<< HEAD
    7. 31 PaginatingDecorator
    8. end
    9. 1 delegate_all
    10. 1 def authors_names
    11. 90 authors.map(&:full_name).join(', ')
    12. end
    13. 1 def categories_names
    14. 1 categories.map(&:name).join(', ')
    15. end
    16. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. =======
    4. >>>>>>> c7a726c5 (Rebased) end

    app/decorators/paginating_decorator.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) 100.0% <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= 100.0% >>>>>>> 872e675 (Fix) <<<<<<< HEAD ======= 100.0% >>>>>>> 0d6dd12 (Manifest_cache true) ======= 100.0% >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD 2 relevant lines. 2 lines covered and >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= 2 relevant lines. 2 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 2 relevant lines. 2 lines covered and >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) class PaginatingDecorator < Draper::CollectionDecorator ======= module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> c8da2e3 (Fix) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> 0d6dd12 (Manifest_cache true) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> e18eb87 (Fix) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> 872e675 (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix)
    4. =======
    5. 12 >>>>>>> 2a25e4c (Featire specs) end

    app/decorators/review_decorator.rb

    100.0% <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= 75.0% >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) lines covered

    4 relevant lines. <<<<<<< HEAD 3 lines covered and <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= 4 lines covered and >>>>>>> 872e675 (Fix) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD class ReviewDecorator < Draper::Decorator >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= class ReviewDecorator < Draper::Decorator >>>>>>> 872e675 (Fix)
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> 872e675 (Fix) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> 0d6dd12 (Manifest_cache true) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD delegate_all >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= delegate_all >>>>>>> 872e675 (Fix)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
    4. 1 <<<<<<< HEAD <<<<<<< HEAD def full_name ======= def date_time >>>>>>> b28889f (Fix) ======= def date_time >>>>>>> 872e675 (Fix)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    6. 2 ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 1d59aaa (Fix)
    7. 1 >>>>>>> b28889f (Fix) =======
    8. 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD "#{first_name} #{last_name}" ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) created_at.strftime('%m/%d/%Y') >>>>>>> b28889f (Fix) ======= created_at.strftime('%m/%d/%Y') >>>>>>> 872e675 (Fix)
    9. end
    10. end
    <<<<<<< HEAD <<<<<<< HEAD

    app/decorators/book_decorator.rb

    90.0% ======= ======= >>>>>>> 872e675 (Fix)

    app/decorators/user_decorator.rb

    100.0% <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) lines covered

    <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= >>>>>>> 49e8a6c (Rebased) 1 lines missed. ======= ======= >>>>>>> 872e675 (Fix) 5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 class UserDecorator < Draper::Decorator
    2. 1 delegate_all
    3. 1 def name_or_email
    4. 2 return name if name.present?
    5. 2 email.split('@').first.capitalize
    6. end
    7. end

    app/helpers/application_helper.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix)
        
    1. 1 require 'image_processing'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :authors >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) module ApplicationHelper >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased)
    3. <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    4. =======
    5. 12 =======
    6. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD end

    app/decorators/review_decorator.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= 75.0% >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    4 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 3 lines covered and <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= 4 lines covered and >>>>>>> 872e675 (Fix) ======= 4 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 4 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD class ReviewDecorator < Draper::Decorator >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= class ReviewDecorator < Draper::Decorator >>>>>>> 872e675 (Fix) ======= class ReviewDecorator < Draper::Decorator >>>>>>> 0d6dd12 (Manifest_cache true) ======= class ReviewDecorator < Draper::Decorator >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased)
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    3. 1 ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD
    4. =======
    5. 13 <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= =======
    6. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= =======
    7. 13 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= =======
    8. 17 >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD delegate_all >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= delegate_all >>>>>>> 872e675 (Fix) ======= delegate_all >>>>>>> 0d6dd12 (Manifest_cache true) ======= delegate_all >>>>>>> e3e66f3 (Featire specs)
    9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    10. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def full_name ======= def date_time >>>>>>> b28889f (Fix) ======= def date_time >>>>>>> 872e675 (Fix) ======= def date_time >>>>>>> 0d6dd12 (Manifest_cache true) ======= def date_time >>>>>>> e3e66f3 (Featire specs)
    11. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    12. 2 =======
    13. 1 >>>>>>> b28889f (Fix) =======
    14. 1 >>>>>>> 872e675 (Fix) =======
    15. 1 >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    16. 1 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD "#{first_name} #{last_name}" ======= ======= >>>>>>> 5b7749a (Fix) created_at.strftime('%m/%d/%Y') >>>>>>> b28889f (Fix) ======= created_at.strftime('%m/%d/%Y') >>>>>>> 872e675 (Fix) ======= created_at.strftime('%m/%d/%Y') >>>>>>> 0d6dd12 (Manifest_cache true) ======= created_at.strftime('%m/%d/%Y') >>>>>>> e3e66f3 (Featire specs) ======= Markdown.new(text).to_html.html_safe >>>>>>> e18eb87 (Fix)
    17. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) end
    18. <<<<<<< HEAD end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

    app/decorators/book_decorator.rb

    90.0% ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

    app/decorators/user_decorator.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= >>>>>>> 49e8a6c (Rebased) 1 lines missed. ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 class UserDecorator < Draper::Decorator
    2. 1 delegate_all
    3. 1 def name_or_email
    4. 2 return name if name.present?
    5. 2 email.split('@').first.capitalize
    6. end
    7. end

    app/helpers/application_helper.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
        
    1. 1 require 'image_processing'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :authors >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs)
    3. end
    <<<<<<< HEAD

    app/helpers/application_helper.rb

    =======

    app/decorators/review_decorator.rb

    >>>>>>> c7a726c5 (Rebased)

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
        
      <<<<<<< HEAD
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true)
    2. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= delegate_all
    3. =======
    4. 1 class ReviewDecorator < Draper::Decorator ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) module ApplicationHelper >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= module ApplicationHelper >>>>>>> 0d6dd12 (Manifest_cache true) ======= module ApplicationHelper >>>>>>> e3e66f3 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
    6. 1 ======= =======
    7. 12 =======
    8. 1 >>>>>>> 49e8a6c (Rebased) =======
    9. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
    10. 1 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 49e8a6c (Rebased) ======= def markdown(text) >>>>>>> 0d6dd12 (Manifest_cache true) ======= def markdown(text) >>>>>>> e3e66f3 (Featire specs)
    11. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    12. =======
    13. 13 <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
    14. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
    15. 13 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
    16. 13 >>>>>>> 0d6dd12 (Manifest_cache true) =======
    17. 13 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate_all
    18. >>>>>>> c7a726c5 (Rebased)
    19. <<<<<<< HEAD
    20. =======
    21. >>>>>>> 824bb2b (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD def full_name
    22. <<<<<<< HEAD
    23. 3 ======= <<<<<<< HEAD
    24. 1 =======
    25. 17 >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD "#{first_name} #{last_name}" ======= created_at.strftime('%m/%d/%Y') ======= Markdown.new(text).to_html.html_safe >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= Markdown.new(text).to_html.html_safe >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= Markdown.new(text).to_html.html_safe >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
    26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) end
    27. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. 1 user = context.current_user
    5. 1 return if params[:shipping].nil?
    6. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
    7. 1 return if user.shipping.update(params[:shipping])
    8. context.fail!
    9. end
    10. end

    app/interactors/user_update.rb

    100.0% lines covered

    13 relevant lines. 13 lines covered and 0 lines missed.
        
    1. 1 class UserUpdate
    2. 1 include Interactor
    3. 1 def call
    4. 5 params = context.permitted_params
    5. 5 user = context.current_user
    6. 5 billing_and_shipping_update(params, user)
    7. 5 return if params[:user].nil?
    8. 3 return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
    9. 2 return if !params[:user][:password].nil? &&
    10. user.reset_password(params[:user][:password], params[:user][:password_confirmation])
    11. 1 context.fail!
    12. end
    13. 1 def billing_and_shipping_update(params, user)
    14. 5 return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
    15. 4 !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
    16. end
    17. end

    app/jobs/application_job.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class ApplicationJob < ActiveJob::Base
    2. # Automatically retry jobs that encountered a deadlock
    3. # retry_on ActiveRecord::Deadlocked
    4. # Most jobs are safe to ignore if the underlying records are no longer available
    5. # discard_on ActiveJob::DeserializationError
    6. end

    app/jobs/cart_cleaner.rb

    60.0% lines covered

    5 relevant lines. 3 lines covered and 2 lines missed.
        
    1. 1 class CartCleaner < ApplicationJob
    2. # include Sidekiq::Job
    3. 1 queue_as :default
    4. 1 def perform(order_id)
    5. order = Order.find(order_id)
    6. order.destroy if order.status.eql?('initialized')
    7. end
    8. end

    app/models/address.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 class Address < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 validates :first_name, :last_name,
    4. length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX }, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true)
    2. <<<<<<< HEAD
    3. =======
    4. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    5. 1 def full_name
    6. 2 "#{first_name} #{last_name}" ======= >>>>>>> 67ab5299 (Fix) ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= =======

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true)
    2. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}" ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    5. <<<<<<< HEAD =======
    6. >>>>>>> bd8bda4 (Manifest_cache true) =======
    7. >>>>>>> 4e81ea2 (Featire specs) =======
    8. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
    9. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
    5. ======= def date_time >>>>>>> c7a726c5 (Rebased)
    6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD def self.collection_decorator_class ======= >>>>>>> e5752db (Featire specs) def self.collection_decorator_class <<<<<<< HEAD ======= ======= def self.collection_decorator_class ======= created_at.strftime('%m/%d/%Y') >>>>>>> c7a726c5 (Rebased)
    7. <<<<<<< HEAD
    8. 31 =======
    9. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD PaginatingDecorator ======= end >>>>>>> c7a726c5 (Rebased)
    10. <<<<<<< HEAD end ======= end

    app/decorators/user_decorator.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 class UserDecorator < Draper::Decorator
    2. 1 delegate_all
    3. 1 def name_or_email
    4. 2 return name if name.present?
    5. 2 email.split('@').first.capitalize >>>>>>> c7a726c5 (Rebased)
    6. <<<<<<< HEAD
    7. 1 delegate_all
    8. 1 def authors_names
    9. 90 authors.map(&:full_name).join(', ')
    10. ======= >>>>>>> c7a726c5 (Rebased) end
    11. <<<<<<< HEAD
    12. 1 def categories_names
    13. 1 categories.map(&:name).join(', ')
    14. end
    15. end
    <<<<<<< HEAD
    ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
    >>>>>>> 0f8241bb (Featire specs)

    app/decorators/category_decorator.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD class CategoryDecorator < Draper::Decorator ======= <<<<<<< HEAD <<<<<<< HEAD require 'image_processing' >>>>>>> 0f8241bb (Featire specs)
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. ======= <<<<<<< HEAD
    4. >>>>>>> c7a726c5 (Rebased) end

    app/helpers/application_helper.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) module ApplicationHelper
    2. <<<<<<< HEAD
    3. ======= <<<<<<< HEAD <<<<<<< HEAD
    4. =======
    5. >>>>>>> 824bb2b (Featire specs) =======
    6. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 ======= >>>>>>> 84003439 (Featire specs) def markdown(text) ======= <<<<<<< HEAD <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs)
    7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    8. 12 =======
    9. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 11792758 (Rebased)
    10. =======
    11. 13 >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 0f8241bb (Featire specs)
    12. 13 ======= <<<<<<< HEAD
    13. 12 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= =======
    14. 12 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD Markdown.new(text).to_html.html_safe ======= Markdown.new(text).to_html >>>>>>> 824bb2b (Featire specs) ======= Markdown.new(text).to_html >>>>>>> 6da9530 (Featire specs)
    15. <<<<<<< HEAD <<<<<<< HEAD
    16. =======
    17. >>>>>>> 824bb2b (Featire specs) =======
    18. >>>>>>> 6da9530 (Featire specs) end
    19. <<<<<<< HEAD <<<<<<< HEAD
    20. =======
    21. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    22. >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) end

    app/helpers/constants.rb

    100.0% lines covered

    21 relevant lines. 21 lines covered and 0 lines missed.
        
    1. 1 module Constants
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 216fe41 (Featire specs) =======
    3. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    4. >>>>>>> 752f0c0 (Featire specs) =======
    5. >>>>>>> 4e81ea2 (Featire specs) =======
    6. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= =======
    7. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
    8. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
    9. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
    10. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    11. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
    12. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= =======
    13. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
    14. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= =======
    15. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
    16. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    17. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
    18. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
    19. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= =======
    20. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 PAGINATION_PER_PAGE = 12 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) ======= decorates_association :categories >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= decorates_association :categories >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= decorates_association :categories >>>>>>> 02a399d (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    22. ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs)
    23. =======
    24. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
    25. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
    26. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= =======
    27. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= =======
    28. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) ======= =======
    29. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) =======
    30. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    31. >>>>>>> 752f0c0 (Featire specs) =======
    32. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    33. >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
    34. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) =======
    35. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= =======
    36. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= =======
    37. >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= =======
    38. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= =======
    39. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs)
    40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs)
    41. 1 STAR_MIN = 0
    42. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 216fe41 (Featire specs)
    43. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) STAR_MAX = 5
    44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 1d11874 (Add login registration pages)
    45. =======
    46. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a71befd (Manifest_cache true) =======
    47. 30 =======
    48. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) =======
    49. 31 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 1d11874 (Add login registration pages) PaginatingDecorator
    50. end
    51. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
    52. >>>>>>> 5b7749a (Fix) =======
    53. >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) =======
    54. >>>>>>> 9e081dc (Fix)
    55. 1 CATALOG_BOOK_COUNT = 3
    56. 1 BEST_SELLER_COUNT = 4
    57. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= delegate_all
    58. 1 def authors_names
    59. <<<<<<< HEAD <<<<<<< HEAD
    60. 1 ======= <<<<<<< HEAD
    61. 89 =======
    62. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    63. 90 >>>>>>> 1214e1f (Add login registration pages) authors.map(&:full_name).join(', ')
    64. end
    65. 1 def categories_names
    66. 1 categories.map(&:name).join(', ')
    67. end
    68. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. <<<<<<< HEAD ======= <<<<<<< HEAD end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
    2. <<<<<<< HEAD
    3. ======= <<<<<<< HEAD
    4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    5. =======
    6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) end
    7. <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true)
    8. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> bd8bda4 (Manifest_cache true)
    2. 1 <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 216fe41 (Featire specs) DESCRIPTION_LENGTH = 25
    3. <<<<<<< HEAD
    4. 1 MIN_PRICE_IN_CENTS = 0
    5. 1 MAX_PRICE_IN_CENTS = 50_000
    6. 1 TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
    7. 1 NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
    8. 1 COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
    9. 1 PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
    10. 1 ZIP_FORMAT = /\A[0-9]+\z/.freeze
    11. 1 VALIDATES_NAME_LENGTH_MAX = 50
    12. 1 VALIDATES_TEXT_LENGTH_MAX = 500
    13. 1 VALIDATES_TITLE_LENGTH_MAX = 80
    14. 1 VALIDATES_PHONE_LENGTH_MAX = 15
    15. 1 VALIDATES_ZIP_LENGTH_MAX = 10
    16. 1 FOOTER_NUMBER = '(555)-555-5555'.freeze
    17. 1 FOOTER_EMAIL = 'support@bookstore.com'.freeze
    18. end
    <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix)

    app/interactors/billing_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed.
        
    1. 1 class BillingUpdate
    2. 1 include Interactor
    3. 1 def call
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= params = context.permitted_params >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) params = context.permitted_params
    6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD
    7. 30 =======
    8. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    9. 31 >>>>>>> 1214e1f (Add login registration pages) =======
    10. >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 03c0867 (Add login registration pages) PaginatingDecorator
    11. end
    12. 1 >>>>>>> 551c6ab (Manifest_cache true) delegate_all
    13. 1 def authors_names
    14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages)
    15. 1 ======= <<<<<<< HEAD
    16. 89 =======
    17. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    18. 90 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    19. 1 <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
    20. 89 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    21. 90 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) authors.map(&:full_name).join(', ')
    22. end
    23. 1 def categories_names
    24. 1 categories.map(&:name).join(', ')
    25. end
    26. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs)
    2. <<<<<<< HEAD <<<<<<< HEAD
    3. ======= <<<<<<< HEAD
    4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    5. =======
    6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    7. >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD end
    8. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)
    9. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 4552227 (Featire specs)
    10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 6fba6be (Featire specs)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true)
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) DESCRIPTION_LENGTH = 25
    3. <<<<<<< HEAD <<<<<<< HEAD
    4. 1 def full_name
    5. 2 "#{first_name} #{last_name}" <<<<<<< HEAD ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs)
    6. <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) end
    7. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> bd8bda4 (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    4. 1 MIN_PRICE_IN_CENTS = 0
    5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD MAX_PRICE_IN_CENTS = 50_000 ======= MAX_PRICE_IN_CENTS = 10_000 >>>>>>> 824bb2b (Featire specs) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> 311e9fa (Rebased) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> 0d6dd12 (Manifest_cache true) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> e3e66f3 (Featire specs) ======= MAX_PRICE_IN_CENTS = 10_000 >>>>>>> 6da9530 (Featire specs)
    6. 1 TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
    7. 1 NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
    8. 1 COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
    9. 1 PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
    10. 1 ZIP_FORMAT = /\A[0-9]+\z/.freeze
    11. 1 VALIDATES_NAME_LENGTH_MAX = 50
    12. 1 VALIDATES_TEXT_LENGTH_MAX = 500
    13. 1 VALIDATES_TITLE_LENGTH_MAX = 80
    14. 1 VALIDATES_PHONE_LENGTH_MAX = 15
    15. 1 VALIDATES_ZIP_LENGTH_MAX = 10
    16. 1 FOOTER_NUMBER = '(555)-555-5555'.freeze
    17. 1 FOOTER_EMAIL = 'support@bookstore.com'.freeze
    18. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    app/interactors/billing_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed.
        
    1. 1 class BillingUpdate
    2. 1 include Interactor
    3. 1 def call
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0676508 (Featire specs)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0676508 (Featire specs) params = context.permitted_params
    6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD
    7. ======= <<<<<<< HEAD
    8. 30 =======
    9. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    10. 31 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD =======
    11. >>>>>>> d782a28 (Manifest_cache true) =======
    12. >>>>>>> 0d6dd12 (Manifest_cache true) =======
    13. >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) PaginatingDecorator
    14. end
    15. 1 delegate_all
    16. 1 def authors_names
    17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
    18. 1 ======= <<<<<<< HEAD
    19. 89 =======
    20. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    21. 90 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD =======
    22. 1 >>>>>>> d782a28 (Manifest_cache true) =======
    23. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
    24. 1 >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) authors.map(&:full_name).join(', ')
    25. end
    26. 1 def categories_names
    27. 1 categories.map(&:name).join(', ')
    28. end
    29. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4552227 (Featire specs)
    4. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD end
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price)

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
    3. ======= <<<<<<< HEAD
    4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    5. =======
    6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
    7. >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) end
    8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
    9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
    10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 02a399d (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 =======
    5. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) "#{first_name} #{last_name}"
    6. end
    7. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors <<<<<<< HEAD <<<<<<< HEAD ======= DESCRIPTION_LENGTH = 25 >>>>>>> d782a28 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 0d6dd12 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> e3e66f3 (Featire specs) ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= delegate_all ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= delegate_all
    3. 1 def full_name
    4. 3 "#{first_name} #{last_name}"
    5. end
    6. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. 1 def full_name
    5. 3 "#{first_name} #{last_name}"
    6. end
    7. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> aa7b40c (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)
    4. 1 user = context.current_user
    5. 1 return if params[:billing].nil?
    6. 1 return if user.billing.update(params[:billing])
    7. context.fail!
    8. end
    9. end

    app/interactors/shipping_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed.
        
    1. 1 class ShippingUpdate
    2. 1 include Interactor
    3. 1 def call
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) params = context.permitted_params
    6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd310ed (Manifest_cache true)
    7. PaginatingDecorator
    8. end
    9. 1 delegate_all
    10. 1 def authors_names
    11. 1 authors.map(&:full_name).join(', ')
    12. end
    13. 1 def categories_names
    14. 1 categories.map(&:name).join(', ')
    15. end
    16. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 42e9c2e (Manifest_cache true)
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 42e9c2e (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> aa7b40c (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= delegate_all ======= >>>>>>> 8181d13 (Featire specs) ======= ======= delegate_all
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}" ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4552227 (Featire specs)
    5. <<<<<<< HEAD end
    6. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 42e9c2e (Manifest_cache true)
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}" ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4552227 (Featire specs)
    5. <<<<<<< HEAD end
    6. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true)
    4. 1 user = context.current_user
    5. 1 return if params[:shipping].nil?
    6. <<<<<<< HEAD <<<<<<< HEAD
    7. 31 PaginatingDecorator
    8. end
    9. 1 delegate_all
    10. 1 def authors_names
    11. 90 authors.map(&:full_name).join(', ')
    12. end
    13. 1 def categories_names
    14. 1 categories.map(&:name).join(', ')
    15. end
    16. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true)
    2. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= delegate_all
    3. 1 def full_name
    4. 3 "#{first_name} #{last_name}"
    5. end
    6. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix)
    4. 1 user = context.current_user
    5. 1 return if params[:shipping].nil?
    6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) =======
    7. =======
    8. 30 >>>>>>> 495b04d (Fix book_spec decrease quantity and price) =======
    9. 31 >>>>>>> 06e5e41 (Add login registration pages) PaginatingDecorator
    10. end
    11. 1 delegate_all
    12. 1 def authors_names
    13. 90 authors.map(&:full_name).join(', ')
    14. end
    15. 1 def categories_names
    16. 1 categories.map(&:name).join(', ')
    17. end
    18. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= class AuthorDecorator < Draper::Decorator >>>>>>> fd6db03 (Manifest_cache true)
    2. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 >>>>>>> 183b6c5 (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 3 "#{first_name} #{last_name}"
    5. end
    6. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix)
    4. 1 return if user.shipping.update(params[:shipping])
    5. context.fail!
    6. end
    7. end

    app/interactors/user_update.rb

    100.0% lines covered

    13 relevant lines. 13 lines covered and 0 lines missed.
        
    1. 1 class UserUpdate
    2. 1 include Interactor
    3. 1 def call
    4. 5 params = context.permitted_params
    5. 5 user = context.current_user
    6. 5 billing_and_shipping_update(params, user)
    7. 5 return if params[:user].nil?
    8. 3 return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
    9. 2 return if !params[:user][:password].nil? &&
    10. user.reset_password(params[:user][:password], params[:user][:password_confirmation])
    11. 1 context.fail!
    12. end
    13. 1 def billing_and_shipping_update(params, user)
    14. 5 return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
    15. 4 !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
    16. end
    17. end
    <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix)

    app/jobs/application_job.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class ApplicationJob < ActiveJob::Base
    2. # Automatically retry jobs that encountered a deadlock
    3. # retry_on ActiveRecord::Deadlocked
    4. # Most jobs are safe to ignore if the underlying records are no longer available
    5. # discard_on ActiveJob::DeserializationError
    6. end

    app/jobs/cart_cleaner.rb

    60.0% lines covered

    5 relevant lines. 3 lines covered and 2 lines missed.
        
    1. 1 class CartCleaner < ApplicationJob
    2. # include Sidekiq::Job
    3. 1 queue_as :default
    4. 1 def perform(order_id)
    5. order = Order.find(order_id)
    6. order.destroy if order.status.eql?('initialized')
    7. end
    8. end
    <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 9e081dc (Fix)

    app/models/address.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 class Address < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 validates :first_name, :last_name,
    4. length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX }, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)
    2. <<<<<<< HEAD
    3. =======
    4. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    5. 1 def full_name
    6. 2 =======
    7. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) "#{first_name} #{last_name}" ======= >>>>>>> 31d15e66 (Fix) ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> aa4361fd (Featire specs) ======= <<<<<<< HEAD ======= =======

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true)
    2. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}" ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD ======= =======

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD
    2. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}" ======= >>>>>>> 872e675 (Fix) ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
    6. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD def self.collection_decorator_class ======= >>>>>>> e5752db (Featire specs) def self.collection_decorator_class <<<<<<< HEAD ======= ======= def self.collection_decorator_class
    6. 31 PaginatingDecorator
    7. end
    8. 1 delegate_all
    9. 1 def authors_names
    10. 90 authors.map(&:full_name).join(', ')
    11. end
    12. 1 def categories_names
    13. 1 categories.map(&:name).join(', ')
    14. end
    15. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD =======
    4. 31 PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 90 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. <<<<<<< HEAD
    4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    5. =======
    6. >>>>>>> 752f0c0 (Featire specs) =======
    7. >>>>>>> bd8bda4 (Manifest_cache true) =======
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> aa7b40c (Manifest_cache true) =======
    10. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs)
    4. PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 1 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> 0b43b18 (Manifest_cache true)
    2. 1 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}"
    5. end
    6. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs)
    5. 1 <<<<<<< HEAD def self.collection_decorator_class
    6. ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs)
    7. PaginatingDecorator
    8. end
    9. 1 delegate_all
    10. 1 def authors_names
    11. 1 authors.map(&:full_name).join(', ')
    12. end
    13. 1 def categories_names
    14. 1 categories.map(&:name).join(', ')
    15. end
    16. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= ======= DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs)
    3. <<<<<<< HEAD
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    5. >>>>>>> bd8bda4 (Manifest_cache true) =======
    6. >>>>>>> 4e81ea2 (Featire specs) =======
    7. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD
    8. >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
    9. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD def self.collection_decorator_class ======= >>>>>>> e5752db (Featire specs) def self.collection_decorator_class <<<<<<< HEAD ======= ======= def self.collection_decorator_class
    6. 31 PaginatingDecorator
    7. end
    8. 1 delegate_all
    9. 1 def authors_names
    10. 90 authors.map(&:full_name).join(', ')
    11. end
    12. 1 def categories_names
    13. 1 categories.map(&:name).join(', ')
    14. end
    15. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
    3. <<<<<<< HEAD =======
    4. 31 PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 90 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs)
    4. PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 1 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> e1ecabbe (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD
    5. >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    6. >>>>>>> 08edf50 (Featire specs) =======
    7. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    8. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    9. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
    10. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
    5. 1 <<<<<<< HEAD def self.collection_decorator_class
    6. 31 PaginatingDecorator
    7. end
    8. 1 delegate_all
    9. 1 def authors_names
    10. 90 authors.map(&:full_name).join(', ')
    11. end
    12. 1 def categories_names
    13. 1 categories.map(&:name).join(', ')
    14. end
    15. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 >>>>>>> aa7b40c (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) format: { with: Constants::NAME_FORMAT,
    5. message: 'Please enter first or last in correct format' }, allow_blank: true
    6. 1 validates :phone,
    7. length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
    8. format: { with: Constants::PHONE_FORMAT,
    9. message: 'Please enter phone in correct format' }, allow_blank: true
    10. 1 validates :address,
    11. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    12. format: { with: Constants::TEXT_FORMAT,
    13. message: 'Please enter address in correct format' }, allow_blank: true
    14. 1 validates :country, :city,
    15. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    16. format: { with: Constants::COUNTY_FORMAT,
    17. message: 'Please enter country in correct format' }, allow_blank: true
    18. 1 validates :zip,
    19. length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
    20. format: { with: Constants::ZIP_FORMAT,
    21. message: 'Please enter zip in correct format' }, allow_blank: true
    22. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 11792758 (Rebased)

    app/models/admin_user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class AdminUser < ApplicationRecord
    2. <<<<<<< HEAD # Include default devise modules. Others available are: ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 >>>>>>> 9bfbd88 (Featire specs)
    3. <<<<<<< HEAD
    4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    5. =======
    6. >>>>>>> 752f0c0 (Featire specs) =======
    7. >>>>>>> bd8bda4 (Manifest_cache true) =======
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> aa7b40c (Manifest_cache true) =======
    10. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    11. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
    12. <<<<<<< HEAD =======
    13. 31 PaginatingDecorator
    14. end
    15. 1 delegate_all
    16. 1 def authors_names
    17. 90 authors.map(&:full_name).join(', ')
    18. end
    19. 1 def categories_names
    20. 1 categories.map(&:name).join(', ')
    21. end
    22. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs)
    4. PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 1 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end ======= devise :database_authenticatable, >>>>>>> c7a726c5 (Rebased)
    4. <<<<<<< HEAD

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> fc3774fd (Featire specs)
    3. <<<<<<< HEAD
    4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    5. >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    6. >>>>>>> 08edf50 (Featire specs) =======
    7. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    8. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    9. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
    10. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def self.collection_decorator_class ======= >>>>>>> 34509eee (Featire specs) def self.collection_decorator_class <<<<<<< HEAD ======= ======= def self.collection_decorator_class
    6. 31 PaginatingDecorator
    7. end
    8. 1 delegate_all
    9. 1 def authors_names
    10. 90 authors.map(&:full_name).join(', ')
    11. end
    12. 1 def categories_names
    13. 1 categories.map(&:name).join(', ')
    14. end
    15. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD =======
    4. 31 PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 90 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs)
    4. PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 1 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 >>>>>>> aa7b40c (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) format: { with: Constants::NAME_FORMAT,
    5. message: 'Please enter first or last in correct format' }, allow_blank: true
    6. 1 validates :phone,
    7. length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
    8. format: { with: Constants::PHONE_FORMAT,
    9. message: 'Please enter phone in correct format' }, allow_blank: true
    10. 1 validates :address,
    11. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    12. format: { with: Constants::TEXT_FORMAT,
    13. message: 'Please enter address in correct format' }, allow_blank: true
    14. 1 validates :country, :city,
    15. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    16. format: { with: Constants::COUNTY_FORMAT,
    17. message: 'Please enter country in correct format' }, allow_blank: true
    18. 1 validates :zip,
    19. length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
    20. format: { with: Constants::ZIP_FORMAT,
    21. message: 'Please enter zip in correct format' }, allow_blank: true
    22. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)

    app/models/admin_user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class AdminUser < ApplicationRecord
    2. <<<<<<< HEAD ======= <<<<<<< HEAD # Include default devise modules. Others available are: ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 >>>>>>> df37394 (Featire specs)
    3. <<<<<<< HEAD
    4. ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= =======
    5. =======
    6. >>>>>>> 752f0c0 (Featire specs) =======
    7. >>>>>>> bd8bda4 (Manifest_cache true) =======
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> aa7b40c (Manifest_cache true) =======
    10. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    11. 1 >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) # Include default devise modules. Others available are: ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= # Include default devise modules. Others available are: >>>>>>> 0d6dd12 (Manifest_cache true) ======= # Include default devise modules. Others available are: >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= # Include default devise modules. Others available are: >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= # Include default devise modules. Others available are: >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
    13. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    14. =======
    15. >>>>>>> 752f0c0 (Featire specs) =======
    16. >>>>>>> bd8bda4 (Manifest_cache true) =======
    17. >>>>>>> 4e81ea2 (Featire specs) =======
    18. >>>>>>> aa7b40c (Manifest_cache true) =======
    19. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    20. >>>>>>> 0d6dd12 (Manifest_cache true) =======
    21. >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= =======
    22. >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
    23. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    24. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Include default devise modules. Others available are: ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= devise :database_authenticatable, >>>>>>> 9a49b7b (Rebased) ======= ======= devise :database_authenticatable, >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= devise :database_authenticatable, >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= devise :database_authenticatable, >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= devise :database_authenticatable, >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    25. >>>>>>> 84003439 (Featire specs) :recoverable, :rememberable, :validatable >>>>>>> c7a726c5 (Rebased)
    26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs)
    27. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    28. ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> f3d746cb (Featire specs)
    29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
    30. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) =======
    31. >>>>>>> bd8bda4 (Manifest_cache true) =======
    32. >>>>>>> 4e81ea2 (Featire specs) =======
    33. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs)
    34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
    35. >>>>>>> 08edf50 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
    36. >>>>>>> 08edf50 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= =======
    37. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> cc390719 (Manifest_cache true)
    38. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
    39. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    40. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
    41. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    42. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    43. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    44. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) =======
    45. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= =======
    46. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= =======
    47. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    48. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= =======
    49. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    50. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= =======
    51. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= =======
    52. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    53. 1 devise :database_authenticatable,
    54. :recoverable, :rememberable, :validatable
    55. ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
    56. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= =======
    57. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    58. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= =======
    59. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    60. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
    61. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    62. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
    63. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    64. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= =======
    65. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    66. >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
    67. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end

    app/models/application_record.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class ApplicationRecord < ActiveRecord::Base
    2. 1 self.abstract_class = true
    3. end

    app/models/author.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) 4 relevant lines. 4 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= 4 relevant lines. 4 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 4 relevant lines. 4 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed.
        
    1. 1 class Author < ApplicationRecord
    2. 1 has_many :authors_books, dependent: :destroy
    3. 1 has_many :books, through: :authors_books
    4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) validates :first_name, :last_name, presence: true ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, :last_name, presence: true ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= validates :first_name, :last_name, presence: true ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) validates :first_name, :last_name, presence: true ======= validates :first_name, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= validates :first_name, :last_name, presence: true >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD
    6. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    7. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    8. 1 validates :last_name, presence: true
    9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
    10. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) end

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true ======= validates :first_name, :last_name, presence: true >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :first_name, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= validates :first_name, :last_name, presence: true >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= validates :first_name, :last_name, presence: true >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
    6. ======= <<<<<<< HEAD <<<<<<< HEAD
    7. ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    8. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs)
    9. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
    10. ======= >>>>>>> 6da9530 (Featire specs) =======
    11. ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD
    12. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    13. 1 validates :last_name, presence: true
    14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    15. >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= =======
    16. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) =======

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, :last_name, presence: true >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 51bc18c (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= validates :first_name, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= validates :first_name, :last_name, presence: true >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD
    6. ======= ======= >>>>>>> 752f0c0 (Featire specs)
    7. 1 validates :last_name, presence: true
    8. <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :first_name, :last_name, presence: true >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :first_name, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs)
    6. ======= <<<<<<< HEAD <<<<<<< HEAD
    7. ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    8. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
    9. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs)
    10. 1 validates :last_name, presence: true
    11. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, :last_name, presence: true >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    6. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs)
    7. 1 validates :last_name, presence: true
    8. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= validates :first_name, :last_name, presence: true >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    6. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs)
    7. 1 validates :last_name, presence: true
    8. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 872e675 (Fix)

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true
    5. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    app/models/billing.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class Billing < Address
    2. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    app/models/book.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) 9 relevant lines. 9 lines covered and ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) 9 relevant lines. 9 lines covered and ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= 9 relevant lines. 9 lines covered and ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= 10 relevant lines. 10 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 8 relevant lines. 8 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= 9 relevant lines. 9 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 10 relevant lines. 10 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= 10 relevant lines. 10 lines covered and >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed.
        
    1. 1 class Book < ApplicationRecord
    2. 1 has_many :authors_books, dependent: :destroy
    3. 1 has_many :authors, through: :authors_books
    4. 1 has_many :books_categories, dependent: :destroy
    5. 1 has_many :categories, through: :books_categories
    6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) has_many :reviews, dependent: :destroy ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= has_many :reviews, dependent: :destroy ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= has_many :reviews, dependent: :destroy ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) has_many :reviews, dependent: :destroy ======= validates :title, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= validates :title, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :title, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= has_many :reviews, dependent: :destroy >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= has_many_attached :images >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= has_many :reviews, dependent: :destroy >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= validates :title, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :title, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= has_many :reviews, dependent: :destroy >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= has_many_attached :images >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= validates :title, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= has_many :reviews, dependent: :destroy >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= has_many_attached :images >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    8. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs)
    9. =======
    10. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    11. 1 >>>>>>> 752f0c0 (Featire specs) =======
    12. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    13. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
    14. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
    15. >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
    16. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    17. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    18. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    19. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
    20. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    21. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
    22. >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= =======
    23. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    24. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
    25. >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) =======
    26. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
    27. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
    28. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= =======
    29. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= =======
    30. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= =======
    31. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 4a2f2ad8 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    32. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    33. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    34. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    35. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
    36. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
    37. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) ======= validates :description, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= validates :description, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :description, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= validates :description, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :description, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= validates :description, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    38. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) has_many_attached :images >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) has_many_attached :images ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= has_many_attached :images >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= has_many :reviews, dependent: :destroy >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= has_many_attached :images >>>>>>> 11792758 (Rebased)
    39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    40. 1 <<<<<<< HEAD <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 4e81ea2 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= validates :price_cents, :quantity, presence: true, >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    41. <<<<<<< HEAD <<<<<<< HEAD numericality: ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD numericality: ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4e81ea2 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= numericality: >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    42. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    43. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    44. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    5. >>>>>>> 75fa7e1b (Rebased)
    6. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD
    7. >>>>>>> 311e9fa (Rebased) 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs)
    8. <<<<<<< HEAD
    9. =======
    10. >>>>>>> 824bb2b (Featire specs) 1 <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= validates :price, :quantity, presence: true, <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
    11. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) numericality: ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, >>>>>>> 824bb2b (Featire specs)
    13. <<<<<<< HEAD numericality: ======= less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS } >>>>>>> 824bb2b (Featire specs)
    14. <<<<<<< HEAD { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    15. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    16. ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. =======
    2. >>>>>>> d0dc1f1 (Featire specs) =======
    3. >>>>>>> 752f0c0 (Featire specs) =======
    4. >>>>>>> 4e81ea2 (Featire specs) =======
    5. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) =======
    6. >>>>>>> d0dc1f1 (Featire specs) =======
    7. >>>>>>> 752f0c0 (Featire specs) =======
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> 08edf50 (Featire specs) =======
    10. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD class BooksCategory < ApplicationRecord
    11. 1 belongs_to :category
    12. 1 belongs_to :book
    13. 1 validates :category, :book, presence: true
    14. ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    5. >>>>>>> 49e8a6c (Rebased)
    6. =======
    7. >>>>>>> d0dc1f1 (Featire specs) =======
    8. >>>>>>> 752f0c0 (Featire specs) =======
    9. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= =======
    10. >>>>>>> 08edf50 (Featire specs) =======
    11. >>>>>>> 7a02bbe (Featire specs) =======
    12. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) has_many_attached :images ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) has_many_attached :images >>>>>>> ee5242b (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD validates :year_of_publication, :materials, :dimensions, presence: true <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= has_many_attached :images >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= has_many_attached :images >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= has_many :reviews, dependent: :destroy >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    14. 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 5b7749a (Fix)
    15. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
    16. 1 =======
    17. >>>>>>> d0dc1f1 (Featire specs) =======
    18. >>>>>>> 752f0c0 (Featire specs) =======
    19. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    20. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    21. >>>>>>> 7a02bbe (Featire specs) =======
    22. >>>>>>> 4552227 (Featire specs) =======
    23. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) validates :price_cents, :quantity, presence: true, ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
    25. numericality:
    26. { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, ======= validates :price_cents, :quantity, presence: true, >>>>>>> 5b7749a (Fix)
    27. numericality:
    28. <<<<<<< HEAD =======
    29. >>>>>>> d0dc1f1 (Featire specs) =======
    30. >>>>>>> 752f0c0 (Featire specs) =======
    31. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    32. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    33. >>>>>>> 08edf50 (Featire specs) =======
    34. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    35. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    36. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    37. >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. ======= ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
    5. >>>>>>> 11792758 (Rebased)
    6. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix)
    7. >>>>>>> 311e9fa (Rebased) 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs)
    8. <<<<<<< HEAD
    9. =======
    10. >>>>>>> 824bb2b (Featire specs) =======
    11. >>>>>>> 6da9530 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) validates :price_cents, :quantity, presence: true, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= validates :price, :quantity, presence: true, <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= ======= validates :price, :quantity, presence: true, <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) numericality: ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, >>>>>>> 824bb2b (Featire specs) ======= { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, >>>>>>> 6da9530 (Featire specs)
    14. <<<<<<< HEAD <<<<<<< HEAD numericality: ======= less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS } >>>>>>> 824bb2b (Featire specs) ======= less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS } >>>>>>> 6da9530 (Featire specs)
    15. <<<<<<< HEAD <<<<<<< HEAD { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    16. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    17. ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. =======
    2. >>>>>>> d0dc1f1 (Featire specs) =======
    3. >>>>>>> 752f0c0 (Featire specs) =======
    4. >>>>>>> 4e81ea2 (Featire specs) =======
    5. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) =======
    6. >>>>>>> d0dc1f1 (Featire specs) =======
    7. >>>>>>> 752f0c0 (Featire specs) =======
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> 08edf50 (Featire specs) =======
    10. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD class BooksCategory < ApplicationRecord
    11. 1 belongs_to :category
    12. 1 belongs_to :book
    13. 1 validates :category, :book, presence: true
    14. ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    5. >>>>>>> 49e8a6c (Rebased)
    6. =======
    7. >>>>>>> d0dc1f1 (Featire specs) =======
    8. >>>>>>> 752f0c0 (Featire specs) =======
    9. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= =======
    10. >>>>>>> 08edf50 (Featire specs) =======
    11. >>>>>>> 7a02bbe (Featire specs) =======
    12. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= has_many_attached :images
    13. 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 5b7749a (Fix)
    14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
    15. 1 =======
    16. >>>>>>> d0dc1f1 (Featire specs) =======
    17. >>>>>>> 752f0c0 (Featire specs) =======
    18. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    19. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    20. >>>>>>> 7a02bbe (Featire specs) =======
    21. >>>>>>> 4552227 (Featire specs) =======
    22. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) validates :price_cents, :quantity, presence: true, ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    23. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
    24. numericality:
    25. { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, ======= validates :price_cents, :quantity, presence: true, >>>>>>> 5b7749a (Fix)
    26. numericality:
    27. <<<<<<< HEAD =======
    28. >>>>>>> d0dc1f1 (Featire specs) =======
    29. >>>>>>> 752f0c0 (Featire specs) =======
    30. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    31. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    32. >>>>>>> 08edf50 (Featire specs) =======
    33. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    34. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    35. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    36. >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. 1 validates :category, :book, presence: true
    5. ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix)
    5. >>>>>>> 49e8a6c (Rebased)
    6. 1 has_many_attached :images
    7. 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
    8. 1 validates :price_cents, :quantity, presence: true,
    9. numericality:
    10. { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    11. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    12. ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. 1 validates :category, :book, presence: true
    5. end

    app/models/category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class Category < ApplicationRecord
    2. 1 has_many :books_categories, dependent: :destroy
    3. 1 has_many :books, through: :books_categories
    4. 1 validates :name, presence: true
    5. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) =======
    ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
    >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 2612be03 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix)
    =======
    =======
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
    =======
    =======
    =======
    ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    =======
    =======
    <<<<<<< HEAD <<<<<<< HEAD =======
    ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
    =======
    =======
    =======
    ======= >>>>>>> 715fac2 (Featire specs) ======= =======

    app/models/user.rb

    100.0% ======= <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs)

    app/queries/book_query.rb

    85.71% <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs)
    >>>>>>> 26b462d (Add login registration pages)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> e1f4d17 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= =======
    >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix)

    app/models/coupon.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
    ======= lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class Coupon < ApplicationRecord
    2. 1 belongs_to :order, optional: true
    3. end

    app/models/order.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class Order < ApplicationRecord
    2. 1 has_many :order_books, dependent: :destroy
    3. 1 has_many :books, through: :order_books
    4. 1 has_one :coupon, dependent: :nullify
    5. end

    app/models/order_book.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 class OrderBook < ApplicationRecord
    2. 1 belongs_to :order
    3. 1 belongs_to :book
    4. end
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)

    app/models/user.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages)
    >>>>>>> e1f4d17 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix)

    app/models/user.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======

    app/models/user.rb

    100.0% ======= >>>>>>> a5d032d (Fix) lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 26b462d (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> e1f4d17 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs)

    app/models/user.rb

    <<<<<<< HEAD =======

    app/models/review.rb

    >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages)

    app/models/user.rb

    >>>>>>> fdab719f (Fix) ======= ======= =======
    >>>>>>> 5b7749a (Fix)

    app/models/coupon.rb

    >>>>>>> ef483b6d (Fix)

    100.0% <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) 7 relevant lines. >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)

    app/queries/book_query.rb

    85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5b7749a (Fix) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 7 relevant lines. 7 lines covered and >>>>>>> aca90e3 (Rebased) ======= 2 relevant lines. 2 lines covered and >>>>>>> fdab719f (Fix) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= class Review < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 belongs_to :book
    4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
    6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
    7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
    8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
    9. 1 validates :rating,
    10. numericality: {
    11. greater_than_or_equal_to: Constants::STAR_MIN,
    12. less_than_or_equal_to: Constants::STAR_MAX
    13. }, presence: true
    14. end

    app/models/shipping.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class Shipping < Address
    2. end

    app/models/user.rb

    50.0% lines covered

    12 relevant lines. 6 lines covered and 6 lines missed.
        
    1. 1 >>>>>>> aca90e3 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> ef483b6d (Fix) class User < ApplicationRecord ======= class Coupon < ApplicationRecord >>>>>>> 5b7749a (Fix)
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> ef483b6d (Fix)
    3. # Include default devise modules. Others available are:
    4. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    5. <<<<<<< HEAD <<<<<<< HEAD =======
    6. >>>>>>> aca90e3 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= =======
    7. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) 1 <<<<<<< HEAD devise :database_authenticatable, :registerable, ======= belongs_to :order, optional: true >>>>>>> 5b7749a (Fix)
    8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix)
    9. =======
    10. >>>>>>> aca90e3 (Rebased) =======
    11. >>>>>>> fdab719f (Fix) :recoverable, :rememberable, :validatable,
    12. <<<<<<< HEAD <<<<<<< HEAD
    13. =======
    14. >>>>>>> aca90e3 (Rebased) =======
    15. >>>>>>> fdab719f (Fix) :confirmable, :lockable, :timeoutable, :trackable,
    16. <<<<<<< HEAD <<<<<<< HEAD
    17. =======
    18. >>>>>>> aca90e3 (Rebased) =======
    19. >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD :omniauthable ======= :omniauthable, omniauth_providers: [:facebook] >>>>>>> aca90e3 (Rebased) ======= :omniauthable >>>>>>> fdab719f (Fix)
    20. <<<<<<< HEAD <<<<<<< HEAD
    21. ======= <<<<<<< HEAD
    22. 1 has_one :billing, dependent: :destroy
    23. 1 has_one :shipping, dependent: :destroy
    24. 1 has_many :reviews, dependent: :destroy
    25. 1 def self.from_omniauth(auth)
    26. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
    27. user.provider = auth.provider
    28. user.uid = auth.uid
    29. user.name = auth.info.name
    30. user.email = auth.info.email
    31. user.password = Devise.friendly_token[0, 20]
    32. end
    33. end
    34. >>>>>>> aca90e3 (Rebased) =======
    35. >>>>>>> fdab719f (Fix) =======
    36. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    >>>>>>> e1f4d17 (Add login registration pages) =======

    app/models/order.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class Order < ApplicationRecord
    2. 1 has_many :order_books, dependent: :destroy
    3. 1 has_many :books, through: :order_books
    4. 1 has_one :coupon, dependent: :nullify
    5. end

    app/models/order_book.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 class OrderBook < ApplicationRecord
    2. 1 belongs_to :order
    3. 1 belongs_to :book
    4. end
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)

    app/models/user.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 85.71% >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)

    app/models/user.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD =======
    >>>>>>> 5b7749a (Fix)

    app/models/coupon.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased)

    app/queries/book_query.rb

    <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5b7749a (Fix) lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 <<<<<<< HEAD class User < ApplicationRecord ======= class Coupon < ApplicationRecord >>>>>>> 5b7749a (Fix)
    2. <<<<<<< HEAD
    3. # Include default devise modules. Others available are:
    4. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    5. =======
    6. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD devise :database_authenticatable, :registerable, ======= belongs_to :order, optional: true >>>>>>> 5b7749a (Fix)
    7. <<<<<<< HEAD
    8. :recoverable, :rememberable, :validatable,
    9. :confirmable, :lockable, :timeoutable, :trackable,
    10. :omniauthable
    11. =======
    12. >>>>>>> 5b7749a (Fix) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages)
    >>>>>>> e1f4d17 (Add login registration pages) =======

    app/models/order.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class Order < ApplicationRecord
    2. 1 has_many :order_books, dependent: :destroy
    3. 1 has_many :books, through: :order_books
    4. 1 has_one :coupon, dependent: :nullify
    5. end

    app/models/order_book.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 class OrderBook < ApplicationRecord
    2. 1 belongs_to :order
    3. 1 belongs_to :book
    4. end
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)

    app/models/user.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 85.71% >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)

    app/models/user.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 90.0% >>>>>>> c7a726c5 (Rebased) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
    >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
    >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    app/models/review.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
    <<<<<<< HEAD =======

    app/models/user.rb

    100.0% ======= >>>>>>> a5d032d (Fix) lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs)
    >>>>>>> bae2b7de (Add login registration pages)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 85.71% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 85.71% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= 85.71% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) lines covered

    <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= 7 relevant lines. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 99dad91f (Fix) ======= 7 relevant lines. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= 7 relevant lines. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> 4a2f2ad8 (Featire specs) 7 relevant lines. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 7 relevant lines. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= 7 relevant lines. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= 7 relevant lines. <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= 7 relevant lines. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) 7 lines covered and 0 lines missed.
        
    1. 1 class Review < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 belongs_to :book
    4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
    6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
    7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
    8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
    9. 1 validates :rating,
    10. numericality: {
    11. greater_than_or_equal_to: Constants::STAR_MIN,
    12. less_than_or_equal_to: Constants::STAR_MAX
    13. }, presence: true
    14. end

    app/models/shipping.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class Shipping < Address
    2. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)

    app/models/user.rb

    53.85% lines covered

    13 relevant lines. 7 lines covered and 6 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. 1 devise :database_authenticatable, :registerable,
    3. :recoverable, :rememberable, :validatable,
    4. :confirmable, :lockable, :timeoutable, :trackable,
    5. :omniauthable, omniauth_providers: [:facebook]
    6. 1 has_one :billing, dependent: :destroy
    7. 1 has_one :shipping, dependent: :destroy
    8. 1 has_one :order, dependent: :destroy
    9. <<<<<<< HEAD
    10. 1 has_many :reviews, dependent: :destroy
    11. 1 def self.from_omniauth(auth)
    12. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
    13. user.provider = auth.provider
    14. user.uid = auth.uid
    15. user.name = auth.info.name
    16. user.email = auth.info.email
    17. user.password = Devise.friendly_token[0, 20]
    18. end
    19. end
    20. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
    <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 490b01d6 (Manifest_cache true)

    app/models/user.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======

    app/models/review.rb

    >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) 2 relevant lines. 2 lines covered and ======= 7 relevant lines. 7 lines covered and >>>>>>> aca90e3 (Rebased) 0 lines missed.
        
    1. 1 <<<<<<< HEAD ======= class Review < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 belongs_to :book
    4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
    6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
    7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
    8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
    9. 1 validates :rating,
    10. numericality: {
    11. greater_than_or_equal_to: Constants::STAR_MIN,
    12. less_than_or_equal_to: Constants::STAR_MAX
    13. }, presence: true
    14. end

    app/models/shipping.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class Shipping < Address
    2. end
    ======= >>>>>>> 6da9530 (Featire specs)

    app/models/user.rb

    50.0% lines covered

    12 relevant lines. 6 lines covered and 6 lines missed.
        
    1. 1 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 6da9530 (Featire specs) class User < ApplicationRecord
    2. <<<<<<< HEAD <<<<<<< HEAD
    3. # Include default devise modules. Others available are:
    4. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    5. =======
    6. >>>>>>> aca90e3 (Rebased) =======
    7. >>>>>>> 6da9530 (Featire specs) 1 devise :database_authenticatable, :registerable,
    8. <<<<<<< HEAD <<<<<<< HEAD
    9. =======
    10. >>>>>>> aca90e3 (Rebased) =======
    11. >>>>>>> 6da9530 (Featire specs) :recoverable, :rememberable, :validatable,
    12. <<<<<<< HEAD <<<<<<< HEAD
    13. =======
    14. >>>>>>> aca90e3 (Rebased) =======
    15. >>>>>>> 6da9530 (Featire specs) :confirmable, :lockable, :timeoutable, :trackable,
    16. <<<<<<< HEAD <<<<<<< HEAD
    17. =======
    18. >>>>>>> aca90e3 (Rebased) =======
    19. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD :omniauthable ======= :omniauthable, omniauth_providers: [:facebook] >>>>>>> aca90e3 (Rebased) ======= :omniauthable, omniauth_providers: [:facebook] >>>>>>> 6da9530 (Featire specs)
    20. <<<<<<< HEAD <<<<<<< HEAD
    21. ======= ======= >>>>>>> 6da9530 (Featire specs)
    22. 1 has_one :billing, dependent: :destroy
    23. 1 has_one :shipping, dependent: :destroy
    24. ======= >>>>>>> 9e081dc (Fix)
    25. 1 has_many :reviews, dependent: :destroy
    26. 1 def self.from_omniauth(auth)
    27. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
    28. user.provider = auth.provider
    29. user.uid = auth.uid
    30. user.name = auth.info.name
    31. user.email = auth.info.email
    32. user.password = Devise.friendly_token[0, 20]
    33. end
    34. end
    35. <<<<<<< HEAD
    36. <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 6da9530 (Featire specs) =======
    37. >>>>>>> 9e081dc (Fix) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> aca90e3 (Rebased)

    app/queries/book_query.rb

    90.0% ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix)
    <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages)

    app/models/user.rb

    100.0% >>>>>>> 6da9530 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) =======
    >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD 87.5% >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 87.5% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 87.5% ======= 85.71% >>>>>>> 752f0c0 (Featire specs) ======= 85.71% >>>>>>> 4e81ea2 (Featire specs) ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 90.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= 90.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= 90.0% >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 8 relevant lines. 7 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 8 relevant lines. 7 lines covered and ======= 7 relevant lines. 6 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 10 relevant lines. 9 lines covered and >>>>>>> c7a726c5 (Rebased) ======= 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 lines missed.
        
    1. 1 class BookQuery
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 0d6dd12 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> e3e66f3 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 0d6dd12 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c7a726c5 (Rebased) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 'title DESC'].freeze ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD 'title DESC'].freeze ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) 'title DESC'].freeze ======= ======= 'title DESC'].freeze ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) 'title DESC'].freeze ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= 'title DESC'].freeze ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 'title DESC'].freeze ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD 'title DESC'].freeze >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 'title DESC'].freeze >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 'title DESC'].freeze >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) 'title DESC'].freeze ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) 'title DESC'].freeze ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 'title DESC'].freeze ======= >>>>>>> c8da2e3 (Fix) ======= 'title DESC'].freeze ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 'title DESC'].freeze ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD 'title DESC'].freeze >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= 'title DESC'].freeze >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= 'title DESC'].freeze >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 'title DESC'].freeze >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 'title DESC'].freeze >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)
    4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) def self.query(params)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages)
    6. =======
    7. >>>>>>> 752f0c0 (Featire specs) =======
    8. >>>>>>> 4e81ea2 (Featire specs) 24 =======
    9. 25 >>>>>>> 1214e1f (Add login registration pages) =======
    10. 24 >>>>>>> 08edf50 (Featire specs) =======
    11. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    12. 30 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
    13. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
    14. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
    15. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
    16. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    17. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
    18. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
    19. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages)
    20. 24 <<<<<<< HEAD ======= =======
    21. 25 >>>>>>> 1214e1f (Add login registration pages) =======
    22. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
    23. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
    24. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages)
    25. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
    26. 30 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
    27. 30 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
    28. 30 >>>>>>> 9620751 (Featire specs) ======= =======
    29. 30 >>>>>>> 6da9530 (Featire specs) =======
    30. 30 >>>>>>> 9620751 (Featire specs) =======
    31. 30 >>>>>>> 2a25e4c (Featire specs) =======
    32. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
    33. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
    34. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    35. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    36. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    37. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    38. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
    39. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    40. 30 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
    41. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    42. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) ======= ======= =======
    43. 25 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
    44. 30 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    45. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    46. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    47. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
    48. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    49. 30 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
    50. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    51. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    52. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
    53. 30 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
    54. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    55. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
    56. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    57. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    58. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    59. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
    60. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
    61. 30 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= =======
    62. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
    63. 24 <<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= =======
    64. 25 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= =======
    65. 30 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= =======
    66. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= =======
    67. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    68. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    69. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= =======
    70. 24 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 99dad91f (Fix) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a2f2ad8 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 392646b5 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    71. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    72. 12 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    73. 12 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) =======
    74. 12 ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    75. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
    76. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    77. =======
    78. >>>>>>> 752f0c0 (Featire specs) =======
    79. >>>>>>> 4e81ea2 (Featire specs) =======
    80. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) >>>>>>> 4a2f2ad8 (Featire specs)
    81. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    82. 12 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
    83. 12 =======
    84. 12 >>>>>>> 9620751 (Featire specs) =======
    85. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
    86. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
    87. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    88. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
    89. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    90. =======
    91. >>>>>>> 752f0c0 (Featire specs) =======
    92. >>>>>>> 4e81ea2 (Featire specs) =======
    93. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
    94. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    95. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    96. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    97. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    98. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
    99. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    100. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> fdab719f (Fix) ======= =======
    101. 7 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    102. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    103. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    104. 12 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) =======
    105. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
    106. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    107. =======
    108. >>>>>>> 752f0c0 (Featire specs) =======
    109. >>>>>>> 4e81ea2 (Featire specs) =======
    110. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
    111. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    112. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    113. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    114. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    115. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
    116. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    117. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    118. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    119. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
    120. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
    121. 12 =======
    122. 12 >>>>>>> 9620751 (Featire specs) =======
    123. 12 >>>>>>> 2a25e4c (Featire specs) =======
    124. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
    125. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    126. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
    127. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
    128. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    129. =======
    130. >>>>>>> 752f0c0 (Featire specs) =======
    131. >>>>>>> 4e81ea2 (Featire specs) =======
    132. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    133. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 715fac2 (Featire specs)
    134. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    135. =======
    136. >>>>>>> 752f0c0 (Featire specs) =======
    137. >>>>>>> 4e81ea2 (Featire specs) =======
    138. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    139. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    140. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
    141. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
    142. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    143. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= =======
    144. 7 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= =======
    145. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    146. 7 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= =======
    147. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    148. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) if params[:category].nil?
    149. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    150. 12 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    151. 12 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) =======
    152. 12 ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    153. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
    154. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    155. =======
    156. >>>>>>> 752f0c0 (Featire specs) =======
    157. >>>>>>> 4e81ea2 (Featire specs) =======
    158. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) >>>>>>> 4a2f2ad8 (Featire specs)
    159. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    160. 12 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
    161. 12 =======
    162. 12 >>>>>>> 9620751 (Featire specs) =======
    163. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
    164. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
    165. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    166. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
    167. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    168. =======
    169. >>>>>>> 752f0c0 (Featire specs) =======
    170. >>>>>>> 4e81ea2 (Featire specs) =======
    171. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
    172. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    173. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    174. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    175. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    176. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
    177. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    178. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> fdab719f (Fix) ======= =======
    179. 7 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    180. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
    181. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    182. =======
    183. >>>>>>> 752f0c0 (Featire specs) =======
    184. >>>>>>> 4e81ea2 (Featire specs) =======
    185. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
    186. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    187. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    188. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    189. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    190. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
    191. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    192. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
    193. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
    194. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
    195. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
    196. 12 =======
    197. 12 >>>>>>> 9620751 (Featire specs) =======
    198. 12 >>>>>>> 2a25e4c (Featire specs) =======
    199. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
    200. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    201. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
    202. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
    203. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    204. =======
    205. >>>>>>> 752f0c0 (Featire specs) =======
    206. >>>>>>> 4e81ea2 (Featire specs) =======
    207. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    208. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 715fac2 (Featire specs)
    209. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    210. =======
    211. >>>>>>> 752f0c0 (Featire specs) =======
    212. >>>>>>> 4e81ea2 (Featire specs) =======
    213. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    214. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    215. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    216. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= =======
    217. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= =======
    218. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= =======
    219. 7 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= ======= =======
    220. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    221. 7 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= =======
    222. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    223. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    224. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    225. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    226. 12 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.order(params[:sort]) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) Book.order(params[:sort]) ======= Book.all.order(params[:sort]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= Book.order(params[:sort]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= Book.order(params[:sort]) >>>>>>> c7a726c5 (Rebased) ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= Book.order(params[:sort]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    227. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 99dad91f (Fix) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a2f2ad8 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    228. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    229. =======
    230. >>>>>>> 752f0c0 (Featire specs) =======
    231. >>>>>>> 4e81ea2 (Featire specs) =======
    232. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    233. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    234. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
    235. =======
    236. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    237. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= =======
    238. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
    239. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    240. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    241. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 392646b5 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
    242. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    243. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    244. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    245. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    246. =======
    247. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    248. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    249. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    250. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    251. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    252. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    253. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    254. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    255. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
    256. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    257. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    258. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
    259. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    260. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    261. =======
    262. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    263. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    264. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    265. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    266. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
    267. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    268. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    269. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
    270. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
    271. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    272. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
    273. =======
    274. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
    275. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
    276. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
    277. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
    278. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
    279. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
    280. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
    281. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    282. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) else
    283. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 99dad91f (Fix) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a2f2ad8 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 72b9cab (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    284. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    285. =======
    286. >>>>>>> 752f0c0 (Featire specs) =======
    287. >>>>>>> 4e81ea2 (Featire specs) =======
    288. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    289. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    290. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
    291. =======
    292. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    293. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= =======
    294. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> 4a2f2ad8 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
    295. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    296. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= =======
    297. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    298. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
    299. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= =======
    300. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    301. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    302. =======
    303. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    304. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    305. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    306. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    307. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= =======
    308. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
    309. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
    310. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
    311. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
    312. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
    313. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= =======
    314. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
    315. =======
    316. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= =======
    317. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= =======
    318. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= =======
    319. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= =======
    320. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    321. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= =======
    322. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    323. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= =======
    324. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= =======
    325. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    326. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    327. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    328. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    329. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    330. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    331. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    332. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    333. =======
    334. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    335. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    336. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    337. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    338. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    339. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    340. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    341. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    342. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    343. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    344. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> c7a726c5 (Rebased) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    345. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 99dad91f (Fix) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a2f2ad8 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    346. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    347. =======
    348. >>>>>>> 752f0c0 (Featire specs) =======
    349. >>>>>>> 4e81ea2 (Featire specs) =======
    350. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    351. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    352. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
    353. =======
    354. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    355. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= =======
    356. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
    357. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    358. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    359. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 392646b5 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
    360. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    361. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    362. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    363. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    364. =======
    365. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    366. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    367. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    368. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    369. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    370. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    371. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    372. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    373. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
    374. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    375. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    376. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
    377. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    378. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    379. =======
    380. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    381. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    382. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    383. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    384. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
    385. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    386. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    387. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
    388. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
    389. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    390. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
    391. =======
    392. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
    393. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
    394. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
    395. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
    396. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
    397. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
    398. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
    399. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    400. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
    401. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    402. 18 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    403. 18 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    404. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    405. =======
    406. >>>>>>> 752f0c0 (Featire specs) =======
    407. >>>>>>> 4e81ea2 (Featire specs) =======
    408. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
    409. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs)
    410. 18 ======= <<<<<<< HEAD
    411. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs)
    412. =======
    413. >>>>>>> 752f0c0 (Featire specs) =======
    414. >>>>>>> 4e81ea2 (Featire specs) =======
    415. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
    416. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    417. 18 elsif params[:category].nil?
    418. 16 Book.all
    419. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> c033601 (Rebased) ======= =======
    420. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    421. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= =======
    422. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= =======
    423. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
    424. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
    425. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
    426. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= =======
    427. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    428. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    429. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) >>>>>>> 9bfbd88 (Featire specs) elsif params[:category].nil?
    430. <<<<<<< HEAD
    431. 16 ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    432. 17 <<<<<<< HEAD ======= =======
    433. 18 >>>>>>> 1214e1f (Add login registration pages) =======
    434. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) Book.all
    435. <<<<<<< HEAD
    436. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) >>>>>>> c033601 (Rebased) ======= =======
    437. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    438. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    439. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= =======
    440. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
    441. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    442. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    443. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= =======
    444. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    445. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    446. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= =======
    447. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
    448. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
    449. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= =======
    450. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
    451. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) >>>>>>> 9bfbd88 (Featire specs) elsif params[:category].nil?
    452. <<<<<<< HEAD <<<<<<< HEAD
    453. 16 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    454. 16 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price)
    455. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    456. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs)
    457. 17 <<<<<<< HEAD ======= =======
    458. 18 >>>>>>> 1214e1f (Add login registration pages) =======
    459. 17 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 4a2f2ad8 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
    460. 17 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= =======
    461. 18 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= =======
    462. 2 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs)
    463. 2 =======
    464. 2 >>>>>>> 9620751 (Featire specs) =======
    465. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
    466. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    467. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) =======
    468. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    469. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= =======
    470. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= =======
    471. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
    472. 18 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) =======
    473. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) <<<<<<< HEAD Book.all ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.all ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> bf05825 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> bf05825 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs)
    474. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
    475. >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    476. =======
    477. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    478. >>>>>>> 9c0d812 (Featire specs) =======
    479. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    480. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs)
    481. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    482. =======
    483. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    484. >>>>>>> 9c0d812 (Featire specs) =======
    485. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    486. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs)
    487. =======
    488. >>>>>>> 752f0c0 (Featire specs) =======
    489. >>>>>>> 4e81ea2 (Featire specs) =======
    490. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
    491. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    492. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs)
    493. =======
    494. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    495. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= =======
    496. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    497. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    498. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 72b9cab (Featire specs) ======= ======= =======
    499. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    500. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    501. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    502. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    503. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    504. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    505. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
    506. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    507. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    508. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
    509. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
    510. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
    511. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) else
    512. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
    513. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages)
    514. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
    515. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    516. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs)
    517. =======
    518. >>>>>>> 752f0c0 (Featire specs) =======
    519. >>>>>>> 4e81ea2 (Featire specs) 17 ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages)
    520. 17 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
    521. 18 >>>>>>> 1214e1f (Add login registration pages) =======
    522. 17 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    523. 17 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
    524. 18 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    525. 18 >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    526. 2 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= ======= =======
    527. 2 >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) =======
    528. 2 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    529. 18 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) =======
    530. 2 >>>>>>> c033601 (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
    531. 2 ======= ======= >>>>>>> e3e66f3 (Featire specs)
    532. 2 =======
    533. 2 >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    534. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    535. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    536. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    537. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    538. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    539. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    540. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
    541. 18 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    542. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
    543. 17 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    544. 17 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    545. 18 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
    546. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= =======
    547. 2 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 06e5e41 (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages)
    548. 18 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) =======
    549. 2 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs)
    550. 2 ======= ======= >>>>>>> e3e66f3 (Featire specs)
    551. 2 =======
    552. 2 >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    553. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    554. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    555. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    556. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    557. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    558. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    559. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
    560. 18 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    561. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
    562. 17 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    563. 17 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    564. 18 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
    565. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs)
    566. 2 =======
    567. 2 >>>>>>> 9620751 (Featire specs) =======
    568. 2 >>>>>>> 2a25e4c (Featire specs) =======
    569. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
    570. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    571. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
    572. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    573. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    574. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    575. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
    576. 18 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
    577. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= =======
    578. 17 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
    579. 17 <<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= =======
    580. 18 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= =======
    581. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= =======
    582. 17 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= =======
    583. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
    584. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    585. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= =======
    586. 17 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 31d15e66 (Fix) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 392646b5 (Featire specs) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    587. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
    588. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    589. ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
    590. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
    591. =======
    592. >>>>>>> 9c0d812 (Featire specs) =======
    593. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
    594. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs)
    595. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
    596. =======
    597. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    598. >>>>>>> 94841b5 (Featire specs) =======
    599. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    600. >>>>>>> 3b03895 (Featire specs) =======
    601. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    602. >>>>>>> e54deeb (Featire specs) =======
    603. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    604. >>>>>>> 9c0d812 (Featire specs) =======
    605. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    606. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    607. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    608. >>>>>>> 94841b5 (Featire specs) =======
    609. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    610. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    611. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    612. >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    613. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    614. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    615. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    616. >>>>>>> 94841b5 (Featire specs) =======
    617. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    618. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    619. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    620. >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    621. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    622. ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    623. >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
    624. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    625. >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    626. >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= =======
    627. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs)
    628. =======
    629. >>>>>>> 752f0c0 (Featire specs) =======
    630. >>>>>>> 4e81ea2 (Featire specs) =======
    631. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    632. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    633. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
    634. =======
    635. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    636. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) =======
    637. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
    638. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
    639. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
    640. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
    641. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    642. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    643. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    644. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    645. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    646. =======
    647. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    648. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    649. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    650. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    651. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    652. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    653. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    654. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    655. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
    656. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
    657. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
    658. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
    659. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    660. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    661. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    662. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
    663. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    664. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    665. =======
    666. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    667. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    668. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    669. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    670. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
    671. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    672. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    673. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
    674. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
    675. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    676. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
    677. =======
    678. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
    679. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
    680. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
    681. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
    682. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
    683. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
    684. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
    685. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    686. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
    687. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    688. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
    689. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
    690. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    691. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
    692. =======
    693. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
    694. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    695. =======
    696. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    697. >>>>>>> 94841b5 (Featire specs) =======
    698. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    699. =======
    700. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    701. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
    702. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    703. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    704. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
    705. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
    706. =======
    707. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
    708. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    709. >>>>>>> e54deeb (Featire specs) =======
    710. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    711. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
    712. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    713. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
    714. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
    715. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    716. =======
    717. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    718. >>>>>>> 9c0d812 (Featire specs) =======
    719. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    720. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    721. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
    722. =======
    723. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    724. >>>>>>> 9c0d812 (Featire specs) =======
    725. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    726. =======
    727. >>>>>>> 9c0d812 (Featire specs) =======
    728. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
    729. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
    730. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
    731. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
    732. =======
    733. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    734. >>>>>>> 94841b5 (Featire specs) =======
    735. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    736. >>>>>>> 3b03895 (Featire specs) =======
    737. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    738. >>>>>>> e54deeb (Featire specs) =======
    739. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    740. >>>>>>> 9c0d812 (Featire specs) =======
    741. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    742. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
    743. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
    744. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    745. =======
    746. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    747. >>>>>>> 9c0d812 (Featire specs) =======
    748. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    749. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= =======
    750. >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    751. =======
    752. >>>>>>> 752f0c0 (Featire specs) =======
    753. >>>>>>> 4e81ea2 (Featire specs) =======
    754. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
    755. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
    756. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    757. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
    758. =======
    759. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
    760. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
    761. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
    762. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
    763. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
    764. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
    765. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    766. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    767. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    768. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    769. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    770. =======
    771. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    772. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    773. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    774. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    775. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    776. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    777. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    778. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    779. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
    780. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    781. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    782. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    783. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    784. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    785. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    786. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
    787. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    788. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    789. =======
    790. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    791. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    792. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    793. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    794. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
    795. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    796. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    797. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
    798. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
    799. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    800. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
    801. =======
    802. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
    803. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
    804. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
    805. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
    806. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
    807. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
    808. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
    809. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    810. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
    811. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    812. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
    813. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) =======
    814. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    815. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
    816. =======
    817. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
    818. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    819. =======
    820. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    821. >>>>>>> 94841b5 (Featire specs) =======
    822. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    823. =======
    824. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    825. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
    826. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    827. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    828. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
    829. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
    830. =======
    831. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
    832. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    833. >>>>>>> e54deeb (Featire specs) =======
    834. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    835. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
    836. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    837. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
    838. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
    839. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    840. =======
    841. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    842. >>>>>>> 9c0d812 (Featire specs) =======
    843. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    844. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    845. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
    846. =======
    847. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    848. >>>>>>> 9c0d812 (Featire specs) =======
    849. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    850. =======
    851. >>>>>>> 9c0d812 (Featire specs) =======
    852. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) =======
    853. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
    854. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
    855. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
    856. =======
    857. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    858. >>>>>>> 94841b5 (Featire specs) =======
    859. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    860. >>>>>>> 3b03895 (Featire specs) =======
    861. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    862. >>>>>>> e54deeb (Featire specs) =======
    863. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    864. >>>>>>> 9c0d812 (Featire specs) =======
    865. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    866. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
    867. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 904663c (Featire specs)
    868. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    869. =======
    870. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    871. >>>>>>> 9c0d812 (Featire specs) =======
    872. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    873. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= =======
    874. >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    875. =======
    876. >>>>>>> 752f0c0 (Featire specs) =======
    877. >>>>>>> 4e81ea2 (Featire specs) =======
    878. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
    879. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
    880. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    881. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
    882. =======
    883. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
    884. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
    885. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= =======
    886. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
    887. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
    888. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
    889. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    890. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    891. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    892. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    893. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    894. =======
    895. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    896. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    897. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    898. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    899. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    900. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    901. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    902. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    903. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
    904. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    905. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    906. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    907. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    908. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    909. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    910. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
    911. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    912. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    913. =======
    914. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    915. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    916. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    917. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    918. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
    919. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    920. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    921. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
    922. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
    923. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    924. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs)
    925. =======
    926. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
    927. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
    928. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
    929. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
    930. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
    931. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
    932. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
    933. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    934. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======

    app/services/book_service.rb

    88.89% lines covered

    9 relevant lines. 8 lines covered and 1 lines missed.
        
    1. 1 class BookService
    2. 1 def self.quantity_update(params, product, order, book, coupon)
    3. 2 discount = 0
    4. 2 product.update(quantity: params[:quantity]) if params[:quantity].to_i <= book.quantity
    5. 2 discount = coupon.discount unless coupon.nil?
    6. 2 if product.save
    7. {
    8. 2 total_price: order.decorate.order_price(discount).to_s,
    9. sub_price: order.decorate.order_price.to_s,
    10. price: product.decorate.total_price.to_s,
    11. 2 discount: (order.decorate.order_price * discount).to_s,
    12. book_quantity: book.quantity
    13. }
    14. else
    15. { notice: 'Error!' }
    16. end
    17. end
    18. end

    app/services/coupon_service.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 class CouponService
    2. 1 def self.find_coupon(params, order, coupon)
    3. 4 error_message = I18n.t('order.coupon.error')
    4. 4 if coupon.nil?
    5. 1 error_message = ' ' if params[:code].eql?('')
    6. {
    7. 1 error: error_message,
    8. total_price: order.decorate.order_price.to_s
    9. }
    10. else
    11. {
    12. 3 total_price: order.decorate.order_price(coupon.discount).to_s,
    13. 3 discount: (order.decorate.order_price * coupon.discount).to_s
    14. }
    15. end
    16. end
    17. end
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======

    app/services/book_service.rb

    88.89% lines covered

    9 relevant lines. 8 lines covered and 1 lines missed.
        
    1. 1 class BookService
    2. 1 def self.quantity_update(params, product, order, book, coupon)
    3. 2 discount = 0
    4. 2 product.update(quantity: params[:quantity]) if params[:quantity].to_i <= book.quantity
    5. 2 discount = coupon.discount unless coupon.nil?
    6. 2 if product.save
    7. {
    8. 2 total_price: order.decorate.order_price(discount).to_s,
    9. sub_price: order.decorate.order_price.to_s,
    10. price: product.decorate.total_price.to_s,
    11. 2 discount: (order.decorate.order_price * discount).to_s,
    12. book_quantity: book.quantity
    13. }
    14. else
    15. { notice: 'Error!' }
    16. end
    17. end
    18. end

    app/services/coupon_service.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 class CouponService
    2. 1 def self.find_coupon(params, order, coupon)
    3. 4 error_message = I18n.t('order.coupon.error')
    4. 4 if coupon.nil?
    5. 1 error_message = ' ' if params[:code].eql?('')
    6. {
    7. 1 error: error_message,
    8. total_price: order.decorate.order_price.to_s
    9. }
    10. else
    11. {
    12. 3 total_price: order.decorate.order_price(coupon.discount).to_s,
    13. 3 discount: (order.decorate.order_price * coupon.discount).to_s
    14. }
    15. end
    16. end
    17. end
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======

    app/services/book_service.rb

    88.89% lines covered

    9 relevant lines. 8 lines covered and 1 lines missed.
        
    1. 1 class BookService
    2. 1 def self.quantity_update(params, product, order, book, coupon)
    3. 2 discount = 0
    4. 2 product.update(quantity: params[:quantity]) if params[:quantity].to_i <= book.quantity
    5. 2 discount = coupon.discount unless coupon.nil?
    6. 2 if product.save
    7. {
    8. 2 total_price: order.decorate.order_price(discount).to_s,
    9. sub_price: order.decorate.order_price.to_s,
    10. price: product.decorate.total_price.to_s,
    11. 2 discount: (order.decorate.order_price * discount).to_s,
    12. book_quantity: book.quantity
    13. }
    14. else
    15. { notice: 'Error!' }
    16. end
    17. end
    18. end

    app/services/coupon_service.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 class CouponService
    2. 1 def self.find_coupon(params, order, coupon)
    3. 4 error_message = I18n.t('order.coupon.error')
    4. 4 if coupon.nil?
    5. 1 error_message = ' ' if params[:code].eql?('')
    6. {
    7. 1 error: error_message,
    8. total_price: order.decorate.order_price.to_s
    9. }
    10. else
    11. {
    12. 3 total_price: order.decorate.order_price(coupon.discount).to_s,
    13. 3 discount: (order.decorate.order_price * coupon.discount).to_s
    14. }
    15. end
    16. end
    17. end
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/application.rb

    100.0% lines covered

    6 relevant lines. 6 lines covered and 0 lines missed.
        
    1. 1 require_relative 'boot'
    2. 1 require 'rails/all'
    3. # Require the gems listed in Gemfile, including any gems
    4. # you've limited to :test, :development, or :production.
    5. 1 Bundler.require(*Rails.groups)
    6. 1 module BookStore
    7. 1 class Application < Rails::Application
    8. # Initialize configuration defaults for originally generated Rails version.
    9. 1 config.load_defaults 6.1
    10. # Configuration for the application, engines, and railties goes here.
    11. #
    12. # These settings can be overridden in specific environments using the files
    13. # in config/environments, which are processed later.
    14. #
    15. # config.time_zone = "Central Time (US & Canada)"
    16. # config.eager_load_paths << Rails.root.join("extras")
    17. end
    18. end

    config/boot.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
    2. 1 require 'bundler/setup' # Set up gems listed in the Gemfile.
    3. 1 require 'bootsnap/setup' # Speed up boot time by caching expensive operations.

    config/environment.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. # Load the Rails application.
    2. 1 require_relative 'application'
    3. # Initialize the Rails application.
    4. 1 Rails.application.initialize!

    config/environments/test.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) 19 relevant lines. 19 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) 19 relevant lines. 19 lines covered and ======= 18 relevant lines. 18 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= 19 relevant lines. 19 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 19 relevant lines. 19 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed.
        
    1. 1 require 'active_support/core_ext/integer/time'
    2. # The test environment is used exclusively to run your application's
    3. # test suite. You never need to work with it otherwise. Remember that
    4. # your test database is "scratch space" for the test suite and is wiped
    5. # and recreated between test runs. Don't rely on the data there!
    6. 1 Rails.application.configure do
    7. # Settings specified here will take precedence over those in config/application.rb.
    8. 1 config.cache_classes = false
    9. 1 config.action_view.cache_template_loading = true
    10. # Do not eager load code on boot. This avoids loading your whole application
    11. # just for the purpose of running a single test. If you are using a tool that
    12. # preloads Rails for running tests, you may have to set it to true.
    13. 1 config.eager_load = false
    14. # Configure public file server for tests with Cache-Control for performance.
    15. 1 config.public_file_server.enabled = true
    16. 1 config.public_file_server.headers = {
    17. 'Cache-Control' => "public, max-age=#{1.hour.to_i}"
    18. }
    19. # Show full error reports and disable caching.
    20. 1 config.consider_all_requests_local = true
    21. 1 config.action_controller.perform_caching = false
    22. 1 config.cache_store = :null_store
    23. # Raise exceptions instead of rendering exception templates.
    24. 1 config.action_dispatch.show_exceptions = false
    25. # Disable request forgery protection in test environment.
    26. 1 config.action_controller.allow_forgery_protection = false
    27. # Store uploaded files on the local file system in a temporary directory.
    28. 1 config.active_storage.service = :test
    29. 1 config.action_mailer.perform_caching = false
    30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    31. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs)
    32. 1 =======
    33. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    34. >>>>>>> 752f0c0 (Featire specs) =======
    35. >>>>>>> 4e81ea2 (Featire specs) =======
    36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
    37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
    38. 1 >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
    39. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    40. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    41. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    42. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
    43. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    44. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
    45. 1 >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= =======
    46. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    47. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
    48. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) =======
    49. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
    50. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
    51. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= =======
    52. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= =======
    53. >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= =======
    54. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= <<<<<<< HEAD ======= >>>>>>> 4a2f2ad8 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    55. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    56. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    57. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    58. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
    59. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
    60. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
    61. # Tell Action Mailer not to deliver emails to the real world.
    62. # The :test delivery method accumulates sent emails in the
    63. # ActionMailer::Base.deliveries array.
    64. 1 config.action_mailer.delivery_method = :test
    65. # Print deprecation notices to the stderr.
    66. 1 config.active_support.deprecation = :stderr
    67. # Raise exceptions for disallowed deprecations.
    68. 1 config.active_support.disallowed_deprecation = :raise
    69. # Tell Active Support which deprecation messages to disallow.
    70. 1 config.active_support.disallowed_deprecation_warnings = []
    71. # Raises error for missing translations.
    72. # config.i18n.raise_on_missing_translations = true
    73. # Annotate rendered view with file names.
    74. # config.action_view.annotate_rendered_view_with_filenames = true
    75. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/initializers/active_admin.rb

    100.0% lines covered

    11 relevant lines. 11 lines covered and 0 lines missed.
        
    1. 1 ActiveAdmin.setup do |config|
    2. 1 config.site_title = 'Book Store'
    3. 1 config.authentication_method = :authenticate_admin_user!
    4. 1 config.current_user_method = :current_admin_user
    5. 1 config.logout_link_path = :destroy_admin_user_session_path
    6. 1 config.batch_actions = true
    7. 1 config.filter_attributes = %i[encrypted_password password password_confirmation]
    8. 1 config.localize_format = :long
    9. 1 config.default_per_page = 30
    10. 1 config.max_per_page = 10_000
    11. 1 config.use_webpacker = true
    12. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/initializers/application_controller_renderer.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # ActiveSupport::Reloader.to_prepare do
    3. # ApplicationController.renderer.defaults.merge!(
    4. # http_host: 'example.org',
    5. # https: false
    6. # )
    7. # end

    config/initializers/assets.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Version of your assets, change this if you want to expire all your assets.
    3. 1 Rails.application.config.assets.version = '1.0'
    4. # Add additional assets to the asset load path.
    5. # Rails.application.config.assets.paths << Emoji.images_path
    6. # Add Yarn node_modules folder to the asset load path.
    7. 1 Rails.application.config.assets.paths << Rails.root.join('node_modules')
    8. # Precompile additional assets.
    9. # application.js, application.css, and all non-JS/CSS in the app/assets
    10. # folder are already added.
    11. # Rails.application.config.assets.precompile += %w( admin.js admin.css )

    config/initializers/backtrace_silencers.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
    3. # Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
    4. # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
    5. # by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
    6. 1 Rails.backtrace_cleaner.remove_silencers! if ENV['BACKTRACE']

    config/initializers/content_security_policy.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Define an application-wide content security policy
    3. # For further information see the following documentation
    4. # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
    5. # Rails.application.config.content_security_policy do |policy|
    6. # policy.default_src :self, :https
    7. # policy.font_src :self, :https, :data
    8. # policy.img_src :self, :https, :data
    9. # policy.object_src :none
    10. # policy.script_src :self, :https
    11. # policy.style_src :self, :https
    12. # # If you are using webpack-dev-server then specify webpack-dev-server host
    13. # policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
    14. # # Specify URI for violation reports
    15. # # policy.report_uri "/csp-violation-report-endpoint"
    16. # end
    17. # If you are using UJS then enable automatic nonce generation
    18. # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
    19. # Set the nonce only to specific directives
    20. # Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
    21. # Report CSP violations to a specified URI
    22. # For further information see the following documentation:
    23. # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
    24. # Rails.application.config.content_security_policy_report_only = true

    config/initializers/cookies_serializer.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Specify a serializer for the signed and encrypted cookie jars.
    3. # Valid options are :json, :marshal, and :hybrid.
    4. 1 Rails.application.config.action_dispatch.cookies_serializer = :json
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)

    config/initializers/devise.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> c871248 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) 14 relevant lines. 14 lines covered and ======= 13 relevant lines. 13 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> ff4c2fe0 (Add login registration pages) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 11792758 (Rebased) ======= 14 relevant lines. 14 lines covered and >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 1d11874 (Add login registration pages) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> 385136b (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= 14 relevant lines. 14 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> ef483b6d (Fix) ======= 14 relevant lines. 14 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 14 relevant lines. 14 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 0 lines missed.
        
    1. # frozen_string_literal: true
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> c871248 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    3. 1 =======
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> ff4c2fe0 (Add login registration pages) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
    5. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e60833c (Add login registration pages) =======
    6. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) =======
    7. 1 >>>>>>> aa3618b (Rebased) =======
    8. 1 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 1d11874 (Add login registration pages) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    9. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> dda81aa9 (Add login registration pages) =======
    10. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> e055dd0 (Rebased) =======
    11. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= =======
    12. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) =======
    13. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
    14. 1 >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= =======
    15. 1 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= =======
    16. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= =======
    17. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= =======
    18. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= =======
    19. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= =======
    20. >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) Devise.setup do |config| <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 793a6ed (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) Devise.setup do |config| <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= Devise.setup do |config| >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= Devise.setup do |config| >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= Devise.setup do |config| >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= Devise.setup do |config| >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD
    22. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    23. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 7a08014b (Featire specs)
    24. 1 ======= ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages)
    25. 1 =======
    26. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    27. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    28. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    29. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) =======
    30. 1 >>>>>>> 5b7749a (Fix) =======
    31. 1 >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> c871248 (Add login registration pages)
    32. 1 =======
    33. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    34. >>>>>>> 730a8ca (Add login registration pages) =======
    35. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= =======
    36. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    37. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    38. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    39. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    40. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) =======
    41. 1 >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # is set to its default value. Note that some are commented out while others <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= Devise.setup do |config| >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    42. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages)
    43. ======= ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages)
    44. >>>>>>> 1d11874 (Add login registration pages) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    45. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    46. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    47. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    48. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
    49. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    50. >>>>>>> 730a8ca (Add login registration pages) =======
    51. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= =======
    52. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    53. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    54. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    55. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) require 'devise/orm/active_record' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # are not: uncommented lines are intended to protect your configuration from <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= require 'devise/orm/active_record' >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages)
    57. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    58. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    59. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    60. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    61. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
    62. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    63. >>>>>>> 730a8ca (Add login registration pages) =======
    64. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= =======
    65. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    66. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    67. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    68. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) config.case_insensitive_keys = [:email] <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # breaking changes in upgrades (i.e., in the event that future versions of <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= config.case_insensitive_keys = [:email] >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages)
    70. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    71. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    72. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    73. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    74. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
    75. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    76. >>>>>>> 730a8ca (Add login registration pages) =======
    77. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= =======
    78. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    79. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    80. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    81. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) config.strip_whitespace_keys = [:email] <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Devise change the default values for those options). <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # Devise change the default values for those options). >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # Devise change the default values for those options). >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= config.strip_whitespace_keys = [:email] >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages)
    83. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    84. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    85. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    86. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    87. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
    88. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    89. >>>>>>> 730a8ca (Add login registration pages) =======
    90. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= =======
    91. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    92. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    93. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    94. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) config.skip_session_storage = [:http_auth] <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) ======= # >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= config.skip_session_storage = [:http_auth] >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    95. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages)
    96. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    97. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    98. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    99. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    100. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
    101. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    102. >>>>>>> 730a8ca (Add login registration pages) =======
    103. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= =======
    104. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    105. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    106. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    107. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) config.stretches = Rails.env.test? ? 1 : 12 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Use this hook to configure devise mailer, warden hooks and so forth. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= config.stretches = Rails.env.test? ? 1 : 12 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    108. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages)
    109. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    110. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    111. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    112. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    113. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
    114. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    115. >>>>>>> 730a8ca (Add login registration pages) =======
    116. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= =======
    117. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    118. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    119. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    120. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) config.reconfirmable = true <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Many of these configuration options can be set straight in your model. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= config.reconfirmable = true >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    121. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
    122. >>>>>>> 9a49b7b (Rebased) >>>>>>> 89d7dcd2 (Manifest_cache true) =======
    123. >>>>>>> c7a726c5 (Rebased) 1 ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) ======= 1 >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= 1 >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= 1 >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 9bfbd88 (Featire specs) ======= Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages) ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages)
    125. 1 =======
    126. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    127. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    128. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    129. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) =======
    130. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    131. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    132. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    133. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) =======
    134. 1 >>>>>>> 5b7749a (Fix) =======
    135. 1 >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    136. >>>>>>> 730a8ca (Add login registration pages) =======
    137. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= =======
    138. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) config.password_length = 6..128 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # The secret key used by Devise. Devise uses this key to generate <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= config.password_length = 6..128 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    139. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages)
    140. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    141. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    142. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    143. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    144. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
    145. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    146. >>>>>>> 730a8ca (Add login registration pages) =======
    147. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= =======
    148. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    149. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    150. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    151. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # random tokens. Changing this key will render invalid all existing <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    152. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages)
    153. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    154. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    155. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    156. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    157. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
    158. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    159. >>>>>>> 730a8ca (Add login registration pages) =======
    160. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= =======
    161. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    162. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    163. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    164. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) config.reset_password_within = 6.hours <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # confirmation, reset password and unlock tokens in the database. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= config.reset_password_within = 6.hours >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    165. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages)
    166. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    167. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    168. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    169. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    170. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
    171. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    172. >>>>>>> 730a8ca (Add login registration pages) =======
    173. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= =======
    174. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    175. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    176. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    177. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) config.sign_out_via = :delete <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Devise will use the `secret_key_base` as its `secret_key` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= config.sign_out_via = :delete >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    178. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages)
    179. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    180. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    181. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    182. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    183. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
    184. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    185. >>>>>>> 730a8ca (Add login registration pages) =======
    186. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= =======
    187. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    188. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    189. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    190. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) config.omniauth :facebook, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # by default. You can change it below and use your own secret key. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= config.omniauth :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    191. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    192. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    193. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) scope: 'email', info_fields: 'email,name' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # ==> Controller configuration <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # ==> Controller configuration >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # ==> Controller configuration >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= scope: 'email', info_fields: 'email,name' >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
    194. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) # Configure the parent class to the devise controllers.
    195. # config.parent_controller = 'DeviseController'
    196. # ==> Mailer Configuration
    197. # Configure the e-mail address which will be shown in Devise::Mailer,
    198. # note that it will be overwritten if you use your own mailer class
    199. # with default "from" parameter.
    200. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages)
    201. >>>>>>> 9a49b7b (Rebased) >>>>>>> 6066f925 (Add login registration pages) 1 =======
    202. >>>>>>> 1214e1f (Add login registration pages) =======
    203. >>>>>>> 730a8ca (Add login registration pages) =======
    204. >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    205. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    206. >>>>>>> 730a8ca (Add login registration pages) =======
    207. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= =======
    208. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' >>>>>>> 49e8a6c (Rebased)
    209. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    210. # Configure the class responsible to send e-mails.
    211. # config.mailer = 'Devise::Mailer'
    212. # Configure the parent class responsible to send e-mails.
    213. # config.parent_mailer = 'ActionMailer::Base'
    214. # ==> ORM configuration
    215. # Load and configure the ORM. Supports :active_record (default) and
    216. # :mongoid (bson_ext recommended) by default. Other ORMs may be
    217. # available as additional gems.
    218. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    219. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    220. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    221. >>>>>>> 730a8ca (Add login registration pages) =======
    222. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    223. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= require 'devise/orm/active_record' >>>>>>> 49e8a6c (Rebased)
    224. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    225. # ==> Configuration for any authentication mechanism
    226. # Configure which keys are used when authenticating a user. The default is
    227. # just :email. You can configure it to use [:username, :subdomain], so for
    228. # authenticating a user, both parameters are required. Remember that those
    229. # parameters are used only when authenticating and not when retrieving from
    230. # session. If you need permissions, you should implement that in a before filter.
    231. # You can also supply a hash where the value is a boolean determining whether
    232. # or not authentication should be aborted when the value is not present.
    233. # config.authentication_keys = [:email]
    234. # Configure parameters from the request object used for authentication. Each entry
    235. # given should be a request method and it will automatically be passed to the
    236. # find_for_authentication method and considered in your model lookup. For instance,
    237. # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
    238. # The same considerations mentioned for authentication_keys also apply to request_keys.
    239. # config.request_keys = []
    240. # Configure which authentication keys should be case-insensitive.
    241. # These keys will be downcased upon creating or modifying a user and when used
    242. # to authenticate or find a user. Default is :email.
    243. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    244. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    245. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    246. >>>>>>> 730a8ca (Add login registration pages) =======
    247. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    248. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.case_insensitive_keys = [:email] >>>>>>> 49e8a6c (Rebased)
    249. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    250. # Configure which authentication keys should have whitespace stripped.
    251. # These keys will have whitespace before and after removed upon creating or
    252. # modifying a user and when used to authenticate or find a user. Default is :email.
    253. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    254. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    255. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    256. >>>>>>> 730a8ca (Add login registration pages) =======
    257. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    258. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.strip_whitespace_keys = [:email] >>>>>>> 49e8a6c (Rebased)
    259. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    260. # Tell if authentication through request.params is enabled. True by default.
    261. # It can be set to an array that will enable params authentication only for the
    262. # given strategies, for example, `config.params_authenticatable = [:database]` will
    263. # enable it only for database (email + password) authentication.
    264. # config.params_authenticatable = true
    265. # Tell if authentication through HTTP Auth is enabled. False by default.
    266. # It can be set to an array that will enable http authentication only for the
    267. # given strategies, for example, `config.http_authenticatable = [:database]` will
    268. # enable it only for database authentication.
    269. # For API-only applications to support authentication "out-of-the-box", you will likely want to
    270. # enable this with :database unless you are using a custom strategy.
    271. # The supported strategies are:
    272. # :database = Support basic authentication with authentication key + password
    273. # config.http_authenticatable = false
    274. # If 401 status code should be returned for AJAX requests. True by default.
    275. # config.http_authenticatable_on_xhr = true
    276. # The realm used in Http Basic Authentication. 'Application' by default.
    277. # config.http_authentication_realm = 'Application'
    278. # It will change confirmation, password recovery and other workflows
    279. # to behave the same regardless if the e-mail provided was right or wrong.
    280. # Does not affect registerable.
    281. # config.paranoid = true
    282. # By default Devise will store the user in session. You can skip storage for
    283. # particular strategies by setting this option.
    284. # Notice that if you are skipping storage for all authentication paths, you
    285. # may want to disable generating routes to Devise's sessions controller by
    286. # passing skip: :sessions to `devise_for` in your config/routes.rb
    287. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    288. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    289. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    290. >>>>>>> 730a8ca (Add login registration pages) =======
    291. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    292. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) ======= # >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.skip_session_storage = [:http_auth] >>>>>>> 49e8a6c (Rebased)
    293. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    294. # By default, Devise cleans up the CSRF token on authentication to
    295. # avoid CSRF token fixation attacks. This means that, when using AJAX
    296. # requests for sign in and sign up, you need to get a new CSRF token
    297. # from the server. You can disable this option at your own risk.
    298. # config.clean_up_csrf_token_on_authentication = true
    299. # When false, Devise will not attempt to reload routes on eager load.
    300. # This can reduce the time taken to boot the app but if your application
    301. # requires the Devise mappings to be loaded during boot time the application
    302. # won't boot properly.
    303. # config.reload_routes = true
    304. # ==> Configuration for :database_authenticatable
    305. # For bcrypt, this is the cost for hashing the password and defaults to 12. If
    306. # using other algorithms, it sets how many times you want the password to be hashed.
    307. # The number of stretches used for generating the hashed password are stored
    308. # with the hashed password. This allows you to change the stretches without
    309. # invalidating existing passwords.
    310. #
    311. # Limiting the stretches to just one in testing will increase the performance of
    312. # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
    313. # a value less than 10 in other environments. Note that, for bcrypt (the default
    314. # algorithm), the cost increases exponentially with the number of stretches (e.g.
    315. # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
    316. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    317. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    318. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    319. >>>>>>> 730a8ca (Add login registration pages) =======
    320. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    321. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.stretches = Rails.env.test? ? 1 : 12 >>>>>>> 49e8a6c (Rebased)
    322. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    323. # Set up a pepper to generate the hashed password.
    324. # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
    325. # Send a notification to the original email when the user's email is changed.
    326. # config.send_email_changed_notification = false
    327. # Send a notification email when the user's password is changed.
    328. # config.send_password_change_notification = false
    329. # ==> Configuration for :confirmable
    330. # A period that the user is allowed to access the website even without
    331. # confirming their account. For instance, if set to 2.days, the user will be
    332. # able to access the website for two days without confirming their account,
    333. # access will be blocked just in the third day.
    334. # You can also set it to nil, which will allow the user to access the website
    335. # without confirming their account.
    336. # Default is 0.days, meaning the user cannot access the website without
    337. # confirming their account.
    338. # config.allow_unconfirmed_access_for = 2.days
    339. # A period that the user is allowed to confirm their account before their
    340. # token becomes invalid. For example, if set to 3.days, the user can confirm
    341. # their account within 3 days after the mail was sent, but on the fourth day
    342. # their account can't be confirmed with the token any more.
    343. # Default is nil, meaning there is no restriction on how long a user can take
    344. # before confirming their account.
    345. # config.confirm_within = 3.days
    346. # If true, requires any email changes to be confirmed (exactly the same way as
    347. # initial account confirmation) to be applied. Requires additional unconfirmed_email
    348. # db field (see migrations). Until confirmed, new email is stored in
    349. # unconfirmed_email column, and copied to email column on successful confirmation.
    350. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    351. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    352. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    353. >>>>>>> 730a8ca (Add login registration pages) =======
    354. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    355. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.reconfirmable = true >>>>>>> 49e8a6c (Rebased)
    356. # Defines which key will be used when confirming an account
    357. # config.confirmation_keys = [:email]
    358. # ==> Configuration for :rememberable
    359. # The time the user will be remembered without asking for credentials again.
    360. # config.remember_for = 2.weeks
    361. # Invalidates all the remember me tokens when the user signs out.
    362. 1 ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages) ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 49e8a6c (Rebased) ======= Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs)
    363. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    364. # If true, extends the user's remember period when remembered via cookie.
    365. # config.extend_remember_period = false
    366. # Options to be passed to the created cookie. For instance, you can set
    367. # secure: true in order to force SSL only cookies.
    368. # config.rememberable_options = {}
    369. # ==> Configuration for :validatable
    370. # Range for password length.
    371. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    372. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    373. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    374. >>>>>>> 730a8ca (Add login registration pages) =======
    375. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    376. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.password_length = 6..128 >>>>>>> 49e8a6c (Rebased)
    377. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    378. # Email regex used to validate email formats. It simply asserts that
    379. # one (and only one) @ exists in the given string. This is mainly
    380. # to give user feedback and not to assert the e-mail validity.
    381. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    382. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    383. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    384. >>>>>>> 730a8ca (Add login registration pages) =======
    385. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    386. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ >>>>>>> 49e8a6c (Rebased)
    387. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    388. # ==> Configuration for :timeoutable
    389. # The time you want to timeout the user session without activity. After this
    390. # time the user will be asked for credentials again. Default is 30 minutes.
    391. # config.timeout_in = 30.minutes
    392. # ==> Configuration for :lockable
    393. # Defines which strategy will be used to lock an account.
    394. # :failed_attempts = Locks an account after a number of failed attempts to sign in.
    395. # :none = No lock strategy. You should handle locking by yourself.
    396. # config.lock_strategy = :failed_attempts
    397. # Defines which key will be used when locking and unlocking an account
    398. # config.unlock_keys = [:email]
    399. # Defines which strategy will be used to unlock an account.
    400. # :email = Sends an unlock link to the user email
    401. # :time = Re-enables login after a certain amount of time (see :unlock_in below)
    402. # :both = Enables both strategies
    403. # :none = No unlock strategy. You should handle unlocking by yourself.
    404. # config.unlock_strategy = :both
    405. # Number of authentication tries before locking an account if lock_strategy
    406. # is failed attempts.
    407. # config.maximum_attempts = 20
    408. # Time interval to unlock the account if :time is enabled as unlock_strategy.
    409. # config.unlock_in = 1.hour
    410. # Warn on the last attempt before the account is locked.
    411. # config.last_attempt_warning = true
    412. # ==> Configuration for :recoverable
    413. #
    414. # Defines which key will be used when recovering the password for an account
    415. # config.reset_password_keys = [:email]
    416. # Time interval you can reset your password with a reset password key.
    417. # Don't put a too small interval or your users won't have the time to
    418. # change their passwords.
    419. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    420. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    421. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    422. >>>>>>> 730a8ca (Add login registration pages) =======
    423. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    424. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.reset_password_within = 6.hours >>>>>>> 49e8a6c (Rebased)
    425. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    426. # When set to false, does not sign a user in automatically after their password is
    427. # reset. Defaults to true, so a user is signed in automatically after a reset.
    428. # config.sign_in_after_reset_password = true
    429. # ==> Configuration for :encryptable
    430. # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
    431. # You can use :sha1, :sha512 or algorithms from others authentication tools as
    432. # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
    433. # for default behavior) and :restful_authentication_sha1 (then you should set
    434. # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
    435. #
    436. # Require the `devise-encryptable` gem when using anything other than bcrypt
    437. # config.encryptor = :sha512
    438. # ==> Scopes configuration
    439. # Turn scoped views on. Before rendering "sessions/new", it will first check for
    440. # "users/sessions/new". It's turned off by default because it's slower if you
    441. # are using only default views.
    442. # config.scoped_views = false
    443. # Configure the default scope given to Warden. By default it's the first
    444. # devise role declared in your routes (usually :user).
    445. # config.default_scope = :user
    446. # Set this configuration to false if you want /users/sign_out to sign out
    447. # only the current scope. By default, Devise signs out all scopes.
    448. # config.sign_out_all_scopes = true
    449. # ==> Navigation configuration
    450. # Lists the formats that should be treated as navigational. Formats like
    451. # :html, should redirect to the sign in page when the user does not have
    452. # access, but formats like :xml or :json, should return 401.
    453. #
    454. # If you have any extra navigational formats, like :iphone or :mobile, you
    455. # should add them to the navigational formats lists.
    456. #
    457. # The "*/*" below is required to match Internet Explorer requests.
    458. # config.navigational_formats = ['*/*', :html]
    459. # The default HTTP method used to sign out a resource. Default is :delete.
    460. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    461. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    462. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    463. >>>>>>> 730a8ca (Add login registration pages) =======
    464. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    465. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.sign_out_via = :delete >>>>>>> 49e8a6c (Rebased)
    466. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    467. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    468. 1 =======
    469. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= =======
    470. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= =======
    471. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) =======
    472. 1 >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    473. >>>>>>> 730a8ca (Add login registration pages) =======
    474. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= =======
    475. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= config.omniauth :facebook, >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= config.omniauth :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased)
    476. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # ==> OmniAuth ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased)
    477. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Add a new OmniAuth provider. Check the wiki for more information on setting ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased)
    478. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # up on your models and hooks. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= scope: 'email', info_fields: 'email,name' >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= scope: 'email', info_fields: 'email,name' >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased)
    479. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
    480. # ==> Warden configuration
    481. # If you want to use other strategies, that are not supported by Devise, or
    482. # change the failure app, you can configure them inside the config.warden block.
    483. #
    484. # config.warden do |manager|
    485. # manager.intercept_401 = false
    486. # manager.default_strategies(scope: :user).unshift :some_external_strategy
    487. # end
    488. # ==> Mountable engine configurations
    489. # When using Devise inside an engine, let's call it `MyEngine`, and this engine
    490. # is mountable, there are some extra configurations to be taken into account.
    491. # The following options are available, assuming the engine is mounted as:
    492. #
    493. # mount MyEngine, at: '/my_engine'
    494. #
    495. # The router that invoked `devise_for`, in the example above, would be:
    496. # config.router_name = :my_engine
    497. #
    498. # When using OmniAuth, Devise cannot automatically set OmniAuth path,
    499. # so you need to do it manually. For the users scope, it would be:
    500. # config.omniauth_path_prefix = '/my_engine/users/auth'
    501. # ==> Turbolinks configuration
    502. # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
    503. #
    504. # ActiveSupport.on_load(:devise_failure_app) do
    505. # include Turbolinks::Controller
    506. # end
    507. # ==> Configuration for :registerable
    508. # When set to false, does not sign a user in automatically after their password is
    509. # changed. Defaults to true, so a user is signed in automatically after changing a password.
    510. # config.sign_in_after_change_password = true
    511. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) # Configure the parent class to the devise controllers.
    512. # config.parent_controller = 'DeviseController'
    513. # ==> Mailer Configuration
    514. # Configure the e-mail address which will be shown in Devise::Mailer,
    515. # note that it will be overwritten if you use your own mailer class
    516. # with default "from" parameter.
    517. <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs)
    518. >>>>>>> c7a726c5 (Rebased) 1 =======
    519. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    520. >>>>>>> 730a8ca (Add login registration pages) =======
    521. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
    522. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    523. >>>>>>> 730a8ca (Add login registration pages) =======
    524. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= =======
    525. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    526. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    527. 1 =======
    528. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    529. >>>>>>> 730a8ca (Add login registration pages) =======
    530. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    531. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    532. >>>>>>> 730a8ca (Add login registration pages) =======
    533. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    534. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= require 'devise/orm/active_record' >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= require 'devise/orm/active_record' >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    535. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    536. 1 =======
    537. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    538. >>>>>>> 730a8ca (Add login registration pages) =======
    539. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    540. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    541. >>>>>>> 730a8ca (Add login registration pages) =======
    542. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    543. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.case_insensitive_keys = [:email] >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.case_insensitive_keys = [:email] >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    544. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    545. 1 =======
    546. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    547. >>>>>>> 730a8ca (Add login registration pages) =======
    548. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    549. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    550. >>>>>>> 730a8ca (Add login registration pages) =======
    551. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    552. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.strip_whitespace_keys = [:email] >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.strip_whitespace_keys = [:email] >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    553. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    554. 1 =======
    555. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    556. >>>>>>> 730a8ca (Add login registration pages) =======
    557. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    558. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    559. >>>>>>> 730a8ca (Add login registration pages) =======
    560. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    561. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) ======= # >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.skip_session_storage = [:http_auth] >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.skip_session_storage = [:http_auth] ======= # >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) ======= # >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.skip_session_storage = [:http_auth] >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    562. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    563. 1 =======
    564. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    565. >>>>>>> 730a8ca (Add login registration pages) =======
    566. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    567. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    568. >>>>>>> 730a8ca (Add login registration pages) =======
    569. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    570. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.stretches = Rails.env.test? ? 1 : 12 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.stretches = Rails.env.test? ? 1 : 12 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    571. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    572. 1 =======
    573. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    574. >>>>>>> 730a8ca (Add login registration pages) =======
    575. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    576. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    577. >>>>>>> 730a8ca (Add login registration pages) =======
    578. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    579. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.reconfirmable = true >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.reconfirmable = true >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    580. 1 ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true <<<<<<< HEAD <<<<<<< HEAD ======= Devise.setup do |config| >>>>>>> 9bfbd88 (Featire specs) ======= Devise.setup do |config| <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= ======= Devise.setup do |config| >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages) ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    581. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    582. 1 =======
    583. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    584. >>>>>>> 730a8ca (Add login registration pages) =======
    585. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    586. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    587. >>>>>>> 730a8ca (Add login registration pages) =======
    588. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    589. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.password_length = 6..128 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.password_length = 6..128 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    590. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    591. 1 =======
    592. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    593. >>>>>>> 730a8ca (Add login registration pages) =======
    594. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    595. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    596. >>>>>>> 730a8ca (Add login registration pages) =======
    597. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    598. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    599. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    600. 1 =======
    601. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    602. >>>>>>> 730a8ca (Add login registration pages) =======
    603. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    604. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    605. >>>>>>> 730a8ca (Add login registration pages) =======
    606. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    607. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.reset_password_within = 6.hours >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.reset_password_within = 6.hours >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    608. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    609. 1 =======
    610. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    611. >>>>>>> 730a8ca (Add login registration pages) =======
    612. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    613. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    614. >>>>>>> 730a8ca (Add login registration pages) =======
    615. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    616. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.sign_out_via = :delete >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.sign_out_via = :delete >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    617. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    618. 1 =======
    619. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    620. >>>>>>> 730a8ca (Add login registration pages) =======
    621. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    622. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    623. >>>>>>> 730a8ca (Add login registration pages) =======
    624. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    625. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.omniauth :facebook, >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.omniauth :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    626. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    627. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    628. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= scope: 'email', info_fields: 'email,name' >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= scope: 'email', info_fields: 'email,name' >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    629. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) # Configure the parent class to the devise controllers.
    630. # config.parent_controller = 'DeviseController'
    631. # ==> Mailer Configuration
    632. # Configure the e-mail address which will be shown in Devise::Mailer,
    633. # note that it will be overwritten if you use your own mailer class
    634. # with default "from" parameter.
    635. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 156ffe6 (Add login registration pages)
    636. >>>>>>> 9a49b7b (Rebased) >>>>>>> bae2b7de (Add login registration pages) 1 =======
    637. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= =======
    638. >>>>>>> 730a8ca (Add login registration pages) =======
    639. >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    640. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    641. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) =======
    642. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= =======
    643. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= =======
    644. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= =======
    645. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= =======
    646. >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' >>>>>>> 49e8a6c (Rebased) ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    647. <<<<<<< HEAD <<<<<<< HEAD
    648. # Configure the class responsible to send e-mails.
    649. # config.mailer = 'Devise::Mailer'
    650. # Configure the parent class responsible to send e-mails.
    651. # config.parent_mailer = 'ActionMailer::Base'
    652. # ==> ORM configuration
    653. # Load and configure the ORM. Supports :active_record (default) and
    654. # :mongoid (bson_ext recommended) by default. Other ORMs may be
    655. # available as additional gems.
    656. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    657. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    658. <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    659. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) =======
    660. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) =======
    661. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= =======
    662. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= =======
    663. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
    664. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= require 'devise/orm/active_record' >>>>>>> 49e8a6c (Rebased) ======= require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= require 'devise/orm/active_record' >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    665. <<<<<<< HEAD <<<<<<< HEAD
    666. # ==> Configuration for any authentication mechanism
    667. # Configure which keys are used when authenticating a user. The default is
    668. # just :email. You can configure it to use [:username, :subdomain], so for
    669. # authenticating a user, both parameters are required. Remember that those
    670. # parameters are used only when authenticating and not when retrieving from
    671. # session. If you need permissions, you should implement that in a before filter.
    672. # You can also supply a hash where the value is a boolean determining whether
    673. # or not authentication should be aborted when the value is not present.
    674. # config.authentication_keys = [:email]
    675. # Configure parameters from the request object used for authentication. Each entry
    676. # given should be a request method and it will automatically be passed to the
    677. # find_for_authentication method and considered in your model lookup. For instance,
    678. # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
    679. # The same considerations mentioned for authentication_keys also apply to request_keys.
    680. # config.request_keys = []
    681. # Configure which authentication keys should be case-insensitive.
    682. # These keys will be downcased upon creating or modifying a user and when used
    683. # to authenticate or find a user. Default is :email.
    684. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    685. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    686. <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    687. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) =======
    688. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) =======
    689. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= =======
    690. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= =======
    691. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
    692. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= config.case_insensitive_keys = [:email] >>>>>>> 49e8a6c (Rebased) ======= config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= config.case_insensitive_keys = [:email] >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    693. <<<<<<< HEAD <<<<<<< HEAD
    694. # Configure which authentication keys should have whitespace stripped.
    695. # These keys will have whitespace before and after removed upon creating or
    696. # modifying a user and when used to authenticate or find a user. Default is :email.
    697. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    698. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    699. <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    700. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) =======
    701. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) =======
    702. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= =======
    703. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= =======
    704. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
    705. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= config.strip_whitespace_keys = [:email] >>>>>>> 49e8a6c (Rebased) ======= config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # Devise change the default values for those options). >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= config.strip_whitespace_keys = [:email] >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # Devise change the default values for those options). >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    706. <<<<<<< HEAD <<<<<<< HEAD
    707. # Tell if authentication through request.params is enabled. True by default.
    708. # It can be set to an array that will enable params authentication only for the
    709. # given strategies, for example, `config.params_authenticatable = [:database]` will
    710. # enable it only for database (email + password) authentication.
    711. # config.params_authenticatable = true
    712. # Tell if authentication through HTTP Auth is enabled. False by default.
    713. # It can be set to an array that will enable http authentication only for the
    714. # given strategies, for example, `config.http_authenticatable = [:database]` will
    715. # enable it only for database authentication.
    716. # For API-only applications to support authentication "out-of-the-box", you will likely want to
    717. # enable this with :database unless you are using a custom strategy.
    718. # The supported strategies are:
    719. # :database = Support basic authentication with authentication key + password
    720. # config.http_authenticatable = false
    721. # If 401 status code should be returned for AJAX requests. True by default.
    722. # config.http_authenticatable_on_xhr = true
    723. # The realm used in Http Basic Authentication. 'Application' by default.
    724. # config.http_authentication_realm = 'Application'
    725. # It will change confirmation, password recovery and other workflows
    726. # to behave the same regardless if the e-mail provided was right or wrong.
    727. # Does not affect registerable.
    728. # config.paranoid = true
    729. # By default Devise will store the user in session. You can skip storage for
    730. # particular strategies by setting this option.
    731. # Notice that if you are skipping storage for all authentication paths, you
    732. # may want to disable generating routes to Devise's sessions controller by
    733. # passing skip: :sessions to `devise_for` in your config/routes.rb
    734. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    735. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    736. <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    737. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) =======
    738. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) =======
    739. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= =======
    740. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= =======
    741. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
    742. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= # >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= config.skip_session_storage = [:http_auth] >>>>>>> 49e8a6c (Rebased) ======= config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= config.skip_session_storage = [:http_auth] >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    743. <<<<<<< HEAD <<<<<<< HEAD
    744. # By default, Devise cleans up the CSRF token on authentication to
    745. # avoid CSRF token fixation attacks. This means that, when using AJAX
    746. # requests for sign in and sign up, you need to get a new CSRF token
    747. # from the server. You can disable this option at your own risk.
    748. # config.clean_up_csrf_token_on_authentication = true
    749. # When false, Devise will not attempt to reload routes on eager load.
    750. # This can reduce the time taken to boot the app but if your application
    751. # requires the Devise mappings to be loaded during boot time the application
    752. # won't boot properly.
    753. # config.reload_routes = true
    754. # ==> Configuration for :database_authenticatable
    755. # For bcrypt, this is the cost for hashing the password and defaults to 12. If
    756. # using other algorithms, it sets how many times you want the password to be hashed.
    757. # The number of stretches used for generating the hashed password are stored
    758. # with the hashed password. This allows you to change the stretches without
    759. # invalidating existing passwords.
    760. #
    761. # Limiting the stretches to just one in testing will increase the performance of
    762. # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
    763. # a value less than 10 in other environments. Note that, for bcrypt (the default
    764. # algorithm), the cost increases exponentially with the number of stretches (e.g.
    765. # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
    766. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    767. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    768. <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    769. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) =======
    770. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) =======
    771. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= =======
    772. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= =======
    773. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
    774. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= config.stretches = Rails.env.test? ? 1 : 12 >>>>>>> 49e8a6c (Rebased) ======= config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= config.stretches = Rails.env.test? ? 1 : 12 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    775. <<<<<<< HEAD <<<<<<< HEAD
    776. # Set up a pepper to generate the hashed password.
    777. # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
    778. # Send a notification to the original email when the user's email is changed.
    779. # config.send_email_changed_notification = false
    780. # Send a notification email when the user's password is changed.
    781. # config.send_password_change_notification = false
    782. # ==> Configuration for :confirmable
    783. # A period that the user is allowed to access the website even without
    784. # confirming their account. For instance, if set to 2.days, the user will be
    785. # able to access the website for two days without confirming their account,
    786. # access will be blocked just in the third day.
    787. # You can also set it to nil, which will allow the user to access the website
    788. # without confirming their account.
    789. # Default is 0.days, meaning the user cannot access the website without
    790. # confirming their account.
    791. # config.allow_unconfirmed_access_for = 2.days
    792. # A period that the user is allowed to confirm their account before their
    793. # token becomes invalid. For example, if set to 3.days, the user can confirm
    794. # their account within 3 days after the mail was sent, but on the fourth day
    795. # their account can't be confirmed with the token any more.
    796. # Default is nil, meaning there is no restriction on how long a user can take
    797. # before confirming their account.
    798. # config.confirm_within = 3.days
    799. # If true, requires any email changes to be confirmed (exactly the same way as
    800. # initial account confirmation) to be applied. Requires additional unconfirmed_email
    801. # db field (see migrations). Until confirmed, new email is stored in
    802. # unconfirmed_email column, and copied to email column on successful confirmation.
    803. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    804. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    805. <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    806. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) =======
    807. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) =======
    808. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= =======
    809. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= =======
    810. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
    811. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= config.reconfirmable = true >>>>>>> 49e8a6c (Rebased) ======= config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= config.reconfirmable = true >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    812. # Defines which key will be used when confirming an account
    813. # config.confirmation_keys = [:email]
    814. # ==> Configuration for :rememberable
    815. # The time the user will be remembered without asking for credentials again.
    816. # config.remember_for = 2.weeks
    817. # Invalidates all the remember me tokens when the user signs out.
    818. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 49e8a6c (Rebased) ======= config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= Devise.setup do |config| >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= Devise.setup do |config| >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    819. <<<<<<< HEAD <<<<<<< HEAD
    820. # If true, extends the user's remember period when remembered via cookie.
    821. # config.extend_remember_period = false
    822. # Options to be passed to the created cookie. For instance, you can set
    823. # secure: true in order to force SSL only cookies.
    824. # config.rememberable_options = {}
    825. # ==> Configuration for :validatable
    826. # Range for password length.
    827. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    828. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    829. <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    830. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) =======
    831. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) =======
    832. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= =======
    833. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= =======
    834. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
    835. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= config.password_length = 6..128 >>>>>>> 49e8a6c (Rebased) ======= config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= config.password_length = 6..128 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    836. <<<<<<< HEAD <<<<<<< HEAD
    837. # Email regex used to validate email formats. It simply asserts that
    838. # one (and only one) @ exists in the given string. This is mainly
    839. # to give user feedback and not to assert the e-mail validity.
    840. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    841. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    842. <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    843. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) =======
    844. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) =======
    845. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= =======
    846. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= =======
    847. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
    848. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ >>>>>>> 49e8a6c (Rebased) ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    849. <<<<<<< HEAD <<<<<<< HEAD
    850. # ==> Configuration for :timeoutable
    851. # The time you want to timeout the user session without activity. After this
    852. # time the user will be asked for credentials again. Default is 30 minutes.
    853. # config.timeout_in = 30.minutes
    854. # ==> Configuration for :lockable
    855. # Defines which strategy will be used to lock an account.
    856. # :failed_attempts = Locks an account after a number of failed attempts to sign in.
    857. # :none = No lock strategy. You should handle locking by yourself.
    858. # config.lock_strategy = :failed_attempts
    859. # Defines which key will be used when locking and unlocking an account
    860. # config.unlock_keys = [:email]
    861. # Defines which strategy will be used to unlock an account.
    862. # :email = Sends an unlock link to the user email
    863. # :time = Re-enables login after a certain amount of time (see :unlock_in below)
    864. # :both = Enables both strategies
    865. # :none = No unlock strategy. You should handle unlocking by yourself.
    866. # config.unlock_strategy = :both
    867. # Number of authentication tries before locking an account if lock_strategy
    868. # is failed attempts.
    869. # config.maximum_attempts = 20
    870. # Time interval to unlock the account if :time is enabled as unlock_strategy.
    871. # config.unlock_in = 1.hour
    872. # Warn on the last attempt before the account is locked.
    873. # config.last_attempt_warning = true
    874. # ==> Configuration for :recoverable
    875. #
    876. # Defines which key will be used when recovering the password for an account
    877. # config.reset_password_keys = [:email]
    878. # Time interval you can reset your password with a reset password key.
    879. # Don't put a too small interval or your users won't have the time to
    880. # change their passwords.
    881. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    882. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    883. <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    884. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) =======
    885. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) =======
    886. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= =======
    887. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= =======
    888. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
    889. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= config.reset_password_within = 6.hours >>>>>>> 49e8a6c (Rebased) ======= config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= config.reset_password_within = 6.hours >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    890. <<<<<<< HEAD <<<<<<< HEAD
    891. # When set to false, does not sign a user in automatically after their password is
    892. # reset. Defaults to true, so a user is signed in automatically after a reset.
    893. # config.sign_in_after_reset_password = true
    894. # ==> Configuration for :encryptable
    895. # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
    896. # You can use :sha1, :sha512 or algorithms from others authentication tools as
    897. # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
    898. # for default behavior) and :restful_authentication_sha1 (then you should set
    899. # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
    900. #
    901. # Require the `devise-encryptable` gem when using anything other than bcrypt
    902. # config.encryptor = :sha512
    903. # ==> Scopes configuration
    904. # Turn scoped views on. Before rendering "sessions/new", it will first check for
    905. # "users/sessions/new". It's turned off by default because it's slower if you
    906. # are using only default views.
    907. # config.scoped_views = false
    908. # Configure the default scope given to Warden. By default it's the first
    909. # devise role declared in your routes (usually :user).
    910. # config.default_scope = :user
    911. # Set this configuration to false if you want /users/sign_out to sign out
    912. # only the current scope. By default, Devise signs out all scopes.
    913. # config.sign_out_all_scopes = true
    914. # ==> Navigation configuration
    915. # Lists the formats that should be treated as navigational. Formats like
    916. # :html, should redirect to the sign in page when the user does not have
    917. # access, but formats like :xml or :json, should return 401.
    918. #
    919. # If you have any extra navigational formats, like :iphone or :mobile, you
    920. # should add them to the navigational formats lists.
    921. #
    922. # The "*/*" below is required to match Internet Explorer requests.
    923. # config.navigational_formats = ['*/*', :html]
    924. # The default HTTP method used to sign out a resource. Default is :delete.
    925. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    926. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    927. <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    928. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) =======
    929. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) =======
    930. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= =======
    931. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= =======
    932. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
    933. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= config.sign_out_via = :delete >>>>>>> 49e8a6c (Rebased) ======= config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= config.sign_out_via = :delete >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    934. <<<<<<< HEAD <<<<<<< HEAD
    935. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    936. 1 =======
    937. <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    938. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) =======
    939. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) =======
    940. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= =======
    941. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= =======
    942. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= =======
    943. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, >>>>>>> ff4c2fe0 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= config.omniauth :facebook, >>>>>>> 49e8a6c (Rebased) ======= config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= config.omniauth :facebook, >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    944. <<<<<<< HEAD <<<<<<< HEAD # ==> OmniAuth ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> ff4c2fe0 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 49e8a6c (Rebased) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    945. <<<<<<< HEAD <<<<<<< HEAD # Add a new OmniAuth provider. Check the wiki for more information on setting ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> ff4c2fe0 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 49e8a6c (Rebased) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    946. <<<<<<< HEAD <<<<<<< HEAD # up on your models and hooks. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' >>>>>>> ff4c2fe0 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= scope: 'email', info_fields: 'email,name' >>>>>>> 49e8a6c (Rebased) ======= scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= # ==> Controller configuration >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= scope: 'email', info_fields: 'email,name' >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= # ==> Controller configuration >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    947. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
    948. # ==> Warden configuration
    949. # If you want to use other strategies, that are not supported by Devise, or
    950. # change the failure app, you can configure them inside the config.warden block.
    951. #
    952. # config.warden do |manager|
    953. # manager.intercept_401 = false
    954. # manager.default_strategies(scope: :user).unshift :some_external_strategy
    955. # end
    956. # ==> Mountable engine configurations
    957. # When using Devise inside an engine, let's call it `MyEngine`, and this engine
    958. # is mountable, there are some extra configurations to be taken into account.
    959. # The following options are available, assuming the engine is mounted as:
    960. #
    961. # mount MyEngine, at: '/my_engine'
    962. #
    963. # The router that invoked `devise_for`, in the example above, would be:
    964. # config.router_name = :my_engine
    965. #
    966. # When using OmniAuth, Devise cannot automatically set OmniAuth path,
    967. # so you need to do it manually. For the users scope, it would be:
    968. # config.omniauth_path_prefix = '/my_engine/users/auth'
    969. # ==> Turbolinks configuration
    970. # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
    971. #
    972. # ActiveSupport.on_load(:devise_failure_app) do
    973. # include Turbolinks::Controller
    974. # end
    975. # ==> Configuration for :registerable
    976. # When set to false, does not sign a user in automatically after their password is
    977. # changed. Defaults to true, so a user is signed in automatically after changing a password.
    978. # config.sign_in_after_change_password = true
    979. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) # Configure the parent class to the devise controllers.
    980. # config.parent_controller = 'DeviseController'
    981. # ==> Mailer Configuration
    982. # Configure the e-mail address which will be shown in Devise::Mailer,
    983. # note that it will be overwritten if you use your own mailer class
    984. # with default "from" parameter.
    985. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) 1 config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
    986. # Configure the class responsible to send e-mails.
    987. # config.mailer = 'Devise::Mailer'
    988. # Configure the parent class responsible to send e-mails.
    989. # config.parent_mailer = 'ActionMailer::Base'
    990. # ==> ORM configuration
    991. # Load and configure the ORM. Supports :active_record (default) and
    992. # :mongoid (bson_ext recommended) by default. Other ORMs may be
    993. # available as additional gems.
    994. 1 require 'devise/orm/active_record'
    995. # ==> Configuration for any authentication mechanism
    996. # Configure which keys are used when authenticating a user. The default is
    997. # just :email. You can configure it to use [:username, :subdomain], so for
    998. # authenticating a user, both parameters are required. Remember that those
    999. # parameters are used only when authenticating and not when retrieving from
    1000. # session. If you need permissions, you should implement that in a before filter.
    1001. # You can also supply a hash where the value is a boolean determining whether
    1002. # or not authentication should be aborted when the value is not present.
    1003. # config.authentication_keys = [:email]
    1004. # Configure parameters from the request object used for authentication. Each entry
    1005. # given should be a request method and it will automatically be passed to the
    1006. # find_for_authentication method and considered in your model lookup. For instance,
    1007. # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
    1008. # The same considerations mentioned for authentication_keys also apply to request_keys.
    1009. # config.request_keys = []
    1010. # Configure which authentication keys should be case-insensitive.
    1011. # These keys will be downcased upon creating or modifying a user and when used
    1012. # to authenticate or find a user. Default is :email.
    1013. 1 config.case_insensitive_keys = [:email]
    1014. # Configure which authentication keys should have whitespace stripped.
    1015. # These keys will have whitespace before and after removed upon creating or
    1016. # modifying a user and when used to authenticate or find a user. Default is :email.
    1017. 1 config.strip_whitespace_keys = [:email]
    1018. # Tell if authentication through request.params is enabled. True by default.
    1019. # It can be set to an array that will enable params authentication only for the
    1020. # given strategies, for example, `config.params_authenticatable = [:database]` will
    1021. # enable it only for database (email + password) authentication.
    1022. # config.params_authenticatable = true
    1023. # Tell if authentication through HTTP Auth is enabled. False by default.
    1024. # It can be set to an array that will enable http authentication only for the
    1025. # given strategies, for example, `config.http_authenticatable = [:database]` will
    1026. # enable it only for database authentication.
    1027. # For API-only applications to support authentication "out-of-the-box", you will likely want to
    1028. # enable this with :database unless you are using a custom strategy.
    1029. # The supported strategies are:
    1030. # :database = Support basic authentication with authentication key + password
    1031. # config.http_authenticatable = false
    1032. # If 401 status code should be returned for AJAX requests. True by default.
    1033. # config.http_authenticatable_on_xhr = true
    1034. # The realm used in Http Basic Authentication. 'Application' by default.
    1035. # config.http_authentication_realm = 'Application'
    1036. # It will change confirmation, password recovery and other workflows
    1037. # to behave the same regardless if the e-mail provided was right or wrong.
    1038. # Does not affect registerable.
    1039. # config.paranoid = true
    1040. # By default Devise will store the user in session. You can skip storage for
    1041. # particular strategies by setting this option.
    1042. # Notice that if you are skipping storage for all authentication paths, you
    1043. # may want to disable generating routes to Devise's sessions controller by
    1044. # passing skip: :sessions to `devise_for` in your config/routes.rb
    1045. 1 config.skip_session_storage = [:http_auth]
    1046. # By default, Devise cleans up the CSRF token on authentication to
    1047. # avoid CSRF token fixation attacks. This means that, when using AJAX
    1048. # requests for sign in and sign up, you need to get a new CSRF token
    1049. # from the server. You can disable this option at your own risk.
    1050. # config.clean_up_csrf_token_on_authentication = true
    1051. # When false, Devise will not attempt to reload routes on eager load.
    1052. # This can reduce the time taken to boot the app but if your application
    1053. # requires the Devise mappings to be loaded during boot time the application
    1054. # won't boot properly.
    1055. # config.reload_routes = true
    1056. # ==> Configuration for :database_authenticatable
    1057. # For bcrypt, this is the cost for hashing the password and defaults to 12. If
    1058. # using other algorithms, it sets how many times you want the password to be hashed.
    1059. # The number of stretches used for generating the hashed password are stored
    1060. # with the hashed password. This allows you to change the stretches without
    1061. # invalidating existing passwords.
    1062. #
    1063. # Limiting the stretches to just one in testing will increase the performance of
    1064. # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
    1065. # a value less than 10 in other environments. Note that, for bcrypt (the default
    1066. # algorithm), the cost increases exponentially with the number of stretches (e.g.
    1067. # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
    1068. 1 config.stretches = Rails.env.test? ? 1 : 12
    1069. # Set up a pepper to generate the hashed password.
    1070. # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
    1071. # Send a notification to the original email when the user's email is changed.
    1072. # config.send_email_changed_notification = false
    1073. # Send a notification email when the user's password is changed.
    1074. # config.send_password_change_notification = false
    1075. # ==> Configuration for :confirmable
    1076. # A period that the user is allowed to access the website even without
    1077. # confirming their account. For instance, if set to 2.days, the user will be
    1078. # able to access the website for two days without confirming their account,
    1079. # access will be blocked just in the third day.
    1080. # You can also set it to nil, which will allow the user to access the website
    1081. # without confirming their account.
    1082. # Default is 0.days, meaning the user cannot access the website without
    1083. # confirming their account.
    1084. # config.allow_unconfirmed_access_for = 2.days
    1085. # A period that the user is allowed to confirm their account before their
    1086. # token becomes invalid. For example, if set to 3.days, the user can confirm
    1087. # their account within 3 days after the mail was sent, but on the fourth day
    1088. # their account can't be confirmed with the token any more.
    1089. # Default is nil, meaning there is no restriction on how long a user can take
    1090. # before confirming their account.
    1091. # config.confirm_within = 3.days
    1092. # If true, requires any email changes to be confirmed (exactly the same way as
    1093. # initial account confirmation) to be applied. Requires additional unconfirmed_email
    1094. # db field (see migrations). Until confirmed, new email is stored in
    1095. # unconfirmed_email column, and copied to email column on successful confirmation.
    1096. 1 config.reconfirmable = true
    1097. # Defines which key will be used when confirming an account
    1098. # config.confirmation_keys = [:email]
    1099. # ==> Configuration for :rememberable
    1100. # The time the user will be remembered without asking for credentials again.
    1101. # config.remember_for = 2.weeks
    1102. # Invalidates all the remember me tokens when the user signs out.
    1103. 1 config.expire_all_remember_me_on_sign_out = true
    1104. # If true, extends the user's remember period when remembered via cookie.
    1105. # config.extend_remember_period = false
    1106. # Options to be passed to the created cookie. For instance, you can set
    1107. # secure: true in order to force SSL only cookies.
    1108. # config.rememberable_options = {}
    1109. # ==> Configuration for :validatable
    1110. # Range for password length.
    1111. 1 config.password_length = 6..128
    1112. # Email regex used to validate email formats. It simply asserts that
    1113. # one (and only one) @ exists in the given string. This is mainly
    1114. # to give user feedback and not to assert the e-mail validity.
    1115. 1 config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
    1116. # ==> Configuration for :timeoutable
    1117. # The time you want to timeout the user session without activity. After this
    1118. # time the user will be asked for credentials again. Default is 30 minutes.
    1119. # config.timeout_in = 30.minutes
    1120. # ==> Configuration for :lockable
    1121. # Defines which strategy will be used to lock an account.
    1122. # :failed_attempts = Locks an account after a number of failed attempts to sign in.
    1123. # :none = No lock strategy. You should handle locking by yourself.
    1124. # config.lock_strategy = :failed_attempts
    1125. # Defines which key will be used when locking and unlocking an account
    1126. # config.unlock_keys = [:email]
    1127. # Defines which strategy will be used to unlock an account.
    1128. # :email = Sends an unlock link to the user email
    1129. # :time = Re-enables login after a certain amount of time (see :unlock_in below)
    1130. # :both = Enables both strategies
    1131. # :none = No unlock strategy. You should handle unlocking by yourself.
    1132. # config.unlock_strategy = :both
    1133. # Number of authentication tries before locking an account if lock_strategy
    1134. # is failed attempts.
    1135. # config.maximum_attempts = 20
    1136. # Time interval to unlock the account if :time is enabled as unlock_strategy.
    1137. # config.unlock_in = 1.hour
    1138. # Warn on the last attempt before the account is locked.
    1139. # config.last_attempt_warning = true
    1140. # ==> Configuration for :recoverable
    1141. #
    1142. # Defines which key will be used when recovering the password for an account
    1143. # config.reset_password_keys = [:email]
    1144. # Time interval you can reset your password with a reset password key.
    1145. # Don't put a too small interval or your users won't have the time to
    1146. # change their passwords.
    1147. 1 config.reset_password_within = 6.hours
    1148. # When set to false, does not sign a user in automatically after their password is
    1149. # reset. Defaults to true, so a user is signed in automatically after a reset.
    1150. # config.sign_in_after_reset_password = true
    1151. # ==> Configuration for :encryptable
    1152. # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
    1153. # You can use :sha1, :sha512 or algorithms from others authentication tools as
    1154. # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
    1155. # for default behavior) and :restful_authentication_sha1 (then you should set
    1156. # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
    1157. #
    1158. # Require the `devise-encryptable` gem when using anything other than bcrypt
    1159. # config.encryptor = :sha512
    1160. # ==> Scopes configuration
    1161. # Turn scoped views on. Before rendering "sessions/new", it will first check for
    1162. # "users/sessions/new". It's turned off by default because it's slower if you
    1163. # are using only default views.
    1164. # config.scoped_views = false
    1165. # Configure the default scope given to Warden. By default it's the first
    1166. # devise role declared in your routes (usually :user).
    1167. # config.default_scope = :user
    1168. # Set this configuration to false if you want /users/sign_out to sign out
    1169. # only the current scope. By default, Devise signs out all scopes.
    1170. # config.sign_out_all_scopes = true
    1171. # ==> Navigation configuration
    1172. # Lists the formats that should be treated as navigational. Formats like
    1173. # :html, should redirect to the sign in page when the user does not have
    1174. # access, but formats like :xml or :json, should return 401.
    1175. #
    1176. # If you have any extra navigational formats, like :iphone or :mobile, you
    1177. # should add them to the navigational formats lists.
    1178. #
    1179. # The "*/*" below is required to match Internet Explorer requests.
    1180. # config.navigational_formats = ['*/*', :html]
    1181. # The default HTTP method used to sign out a resource. Default is :delete.
    1182. 1 config.sign_out_via = :delete
    1183. # ==> OmniAuth
    1184. # Add a new OmniAuth provider. Check the wiki for more information on setting
    1185. # up on your models and hooks.
    1186. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
    1187. # ==> Warden configuration
    1188. # If you want to use other strategies, that are not supported by Devise, or
    1189. # change the failure app, you can configure them inside the config.warden block.
    1190. #
    1191. # config.warden do |manager|
    1192. # manager.intercept_401 = false
    1193. # manager.default_strategies(scope: :user).unshift :some_external_strategy
    1194. # end
    1195. # ==> Mountable engine configurations
    1196. # When using Devise inside an engine, let's call it `MyEngine`, and this engine
    1197. # is mountable, there are some extra configurations to be taken into account.
    1198. # The following options are available, assuming the engine is mounted as:
    1199. #
    1200. # mount MyEngine, at: '/my_engine'
    1201. #
    1202. # The router that invoked `devise_for`, in the example above, would be:
    1203. # config.router_name = :my_engine
    1204. #
    1205. # When using OmniAuth, Devise cannot automatically set OmniAuth path,
    1206. # so you need to do it manually. For the users scope, it would be:
    1207. # config.omniauth_path_prefix = '/my_engine/users/auth'
    1208. # ==> Turbolinks configuration
    1209. # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
    1210. #
    1211. # ActiveSupport.on_load(:devise_failure_app) do
    1212. # include Turbolinks::Controller
    1213. # end
    1214. # ==> Configuration for :registerable
    1215. # When set to false, does not sign a user in automatically after their password is
    1216. # changed. Defaults to true, so a user is signed in automatically after changing a password.
    1217. # config.sign_in_after_change_password = true
    1218. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 73f364d8 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/initializers/filter_parameter_logging.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Configure sensitive parameters which will be filtered from the log file.
    3. 1 Rails.application.config.filter_parameters += %i[
    4. passw secret token _key crypt salt certificate otp ssn
    5. ]

    config/initializers/inflections.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Add new inflection rules using the following format. Inflections
    3. # are locale specific, and you may define rules for as many different
    4. # locales as you wish. All of these examples are active by default:
    5. # ActiveSupport::Inflector.inflections(:en) do |inflect|
    6. # inflect.plural /^(ox)$/i, '\1en'
    7. # inflect.singular /^(ox)en/i, '\1'
    8. # inflect.irregular 'person', 'people'
    9. # inflect.uncountable %w( fish sheep )
    10. # end
    11. # These inflection rules are supported but not enabled by default:
    12. # ActiveSupport::Inflector.inflections(:en) do |inflect|
    13. # inflect.acronym 'RESTful'
    14. # end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/initializers/kaminari.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 Kaminari.configure do |config|
    2. 1 config.page_method_name = :per_page_kaminari
    3. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/initializers/mime_types.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Add new mime types for use in respond_to blocks:
    3. # Mime::Type.register "text/richtext", :rtf
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
    ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs)
    >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD =======
    >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 9c0d812 (Featire specs)
    >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD
    >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true)
    >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
    >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix)
    >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs)
    =======
    >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
    >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix)
    >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
    >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    config/initializers/money.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 Money.locale_backend = :i18n
    2. 1 Money.rounding_mode = BigDecimal::ROUND_HALF_EVEN
    3. 1 Money.default_currency = Money::Currency.new('EUR')
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)

    config/initializers/omniauth.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> c871248 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) 3 relevant lines. 3 lines covered and ======= 2 relevant lines. 2 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> ff4c2fe0 (Add login registration pages) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 11792758 (Rebased) ======= 3 relevant lines. 3 lines covered and >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 1d11874 (Add login registration pages) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> 385136b (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= 3 relevant lines. 3 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> ef483b6d (Fix) ======= 3 relevant lines. 3 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 3 relevant lines. 3 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) OmniAuth.config.logger = Rails.logger
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) Rails.application.config.middleware.use OmniAuth::Builder do
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs)
    4. =======
    5. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    6. >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages)
    7. =======
    8. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= =======
    9. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
    10. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= =======
    11. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= =======
    12. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    13. =======
    14. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e011b0df (Add login registration pages) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> a8b17c32 (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages)
    15. =======
    16. >>>>>>> 1214e1f (Add login registration pages) =======
    17. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) =======
    18. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= =======
    19. >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
    20. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    21. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= =======
    22. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= =======
    23. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
    24. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
    25. >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= =======
    26. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) =======
    27. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= =======
    28. >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= =======
    29. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
    30. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= =======
    31. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= =======
    32. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= =======
    33. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= =======
    34. =======
    35. >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) =======
    36. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= =======
    37. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= =======
    38. =======
    39. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= =======
    40. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= =======
    41. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= =======
    42. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= =======
    43. >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= provider :facebook, >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= provider :facebook, >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= provider :facebook, >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e011b0df (Add login registration pages) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> a8b17c32 (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= provider :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= provider :facebook, >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= provider :facebook, >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= provider :facebook, >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= provider :facebook, >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= provider :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= provider :facebook, >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= provider :facebook, >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= provider :facebook, >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= provider :facebook, >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
    44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)
    45. Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
    46. Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
    47. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD scope: 'public_profile, email', info_fields: 'email, first_name, last_name' ======= scope: 'email', info_fields: 'email,name' >>>>>>> c7a726c5 (Rebased) ======= scope: 'public_profile, email', info_fields: 'email, first_name, last_name' >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 1049b80c (Fix) scope: 'public_profile, email', info_fields: 'email, first_name, last_name' ======= scope: 'email', info_fields: 'email,name' >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= scope: 'public_profile, email', info_fields: 'email, first_name, last_name' >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)
    48. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    49. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) =======
    50. >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= =======
    51. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= =======
    52. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
    53. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) =======
    54. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= =======
    55. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
    56. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======
    57. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= =======
    58. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
    59. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    60. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= =======
    61. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= =======
    62. >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) =======
    63. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= =======
    64. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
    65. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======
    66. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= =======
    67. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= =======
    68. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
    69. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= =======
    70. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
    71. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    72. >>>>>>> 730a8ca (Add login registration pages) =======
    73. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= =======
    74. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= =======
    75. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= =======
    76. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= =======
    77. >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/initializers/permissions_policy.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Define an application-wide HTTP permissions policy. For further
    2. # information see https://developers.google.com/web/updates/2018/06/feature-policy
    3. #
    4. # Rails.application.config.permissions_policy do |f|
    5. # f.camera :none
    6. # f.gyroscope :none
    7. # f.microphone :none
    8. # f.usb :none
    9. # f.fullscreen :self
    10. # f.payment :self, "https://secure.example.com"
    11. # end

    config/initializers/wrap_parameters.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # This file contains settings for ActionController::ParamsWrapper which
    3. # is enabled by default.
    4. # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
    5. 1 ActiveSupport.on_load(:action_controller) do
    6. 2 wrap_parameters format: [:json]
    7. end
    8. # To enable root element in JSON for ActiveRecord objects.
    9. # ActiveSupport.on_load(:active_record) do
    10. # self.include_root_in_json = true
    11. # end

    config/routes.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) 3 relevant lines. 3 lines covered and ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) 3 relevant lines. 3 lines covered and ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 31507b8 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 3 relevant lines. 3 lines covered and ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= 3 relevant lines. 3 lines covered and ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) 9 relevant lines. 9 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD require 'sidekiq/web'
    2. <<<<<<< HEAD
    3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= ======= >>>>>>> 512d1d87 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) root 'home#index' ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) root 'home#index' ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 31507b8 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) root 'home#index' ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= root 'home#index' ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= root 'home#index' ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= root 'home#index' ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) ======= devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 9d98d9ab (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) ======= devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages)
    4. =======
    5. >>>>>>> 7c4ea7f (Fix)
    6. 1 ======= >>>>>>> 6da9530 (Featire specs) Rails.application.routes.draw do ======= require 'sidekiq/web' >>>>>>> 9e081dc (Fix)
    7. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9e081dc (Fix)
    8. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) root 'home#index' ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= root 'home#index' ======= >>>>>>> df37394 (Featire specs) ======= root 'home#index' ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 2ee03d3 (Featire specs) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= root 'home#index' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= devise_for :users >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs)
    9. =======
    10. >>>>>>> 7c4ea7f (Fix)
    11. <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) =======
    12. 1 Rails.application.routes.draw do
    13. >>>>>>> 9e081dc (Fix)
    14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) root 'home#index' ======= ActiveAdmin.routes(self) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 852864e (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> d8abfed3 (Featire specs) root 'home#index' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ActiveAdmin.routes(self) ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ActiveAdmin.routes(self) ======= resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ActiveAdmin.routes(self) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= resources :books, only: %i[show index] ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= resources :books, only: %i[show index] >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= root 'home#index' >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ActiveAdmin.routes(self) ======= resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 1214e1f (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ActiveAdmin.routes(self) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= resources :books, only: %i[show index] ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= resources :books, only: %i[show index] >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= root 'home#index' >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs)
    15. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    16. 1 <<<<<<< HEAD authenticate :admin_user do
    17. <<<<<<< HEAD
    18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
    ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) } ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ActiveAdmin.routes(self) ======= resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 1214e1f (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ActiveAdmin.routes(self) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 1214e1f (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 4552227 (Featire specs) ======= root 'home#index' >>>>>>> 26b462d (Add login registration pages) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) root 'home#index' >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
    4. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 5506bd0 (Featire specs)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD authenticate :admin_user do
    6. 1 mount Sidekiq::Web => '/sidekiq'
    7. end
    8. 1 ActiveAdmin.routes(self)
    9. <<<<<<< HEAD
    10. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
    11. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
    12. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased)
    14. =======
    15. >>>>>>> 1d59aaa (Fix) 1 <<<<<<< HEAD ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) resources :books, only: %i[show index]
    16. <<<<<<< HEAD <<<<<<< HEAD
    17. ======= ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD
    18. ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD
    19. =======
    20. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= =======
    21. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 715fac2 (Featire specs) end
    >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD root 'home#index' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) }
    4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
    5. 1 context 'when decorate' do
    6. 1 it '#full_name' do
    7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    8. end
    9. end
    10. ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> 0b43b18 (Manifest_cache true)

    spec/decorators/author_decorator_spec.rb

    =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b43b18 (Manifest_cache true) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true)
    4. <<<<<<< HEAD ======= <<<<<<< HEAD
    5. ======= >>>>>>> da3a9a3 (Featire specs)
    6. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
    7. 1 context 'when decorate' do
    8. 1 it '#full_name' do
    9. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    10. end
    11. end
    12. <<<<<<< HEAD end
    >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } ======= let(:book_decorator) { described_class.new(book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
    4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    5. <<<<<<< HEAD
    6. 2 ======= ======= >>>>>>> 5b7749a (Fix)
    7. 1 mount Sidekiq::Web => '/sidekiq'
    8. end
    9. 1 ActiveAdmin.routes(self)
    10. <<<<<<< HEAD end
    11. end
    12. <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> da3a9a3 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> da3a9a3 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD
    4. =======
    5. >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
    6. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs)
    7. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    9. =======
    10. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD resources :books, only: %i[show index]
    11. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) end
    >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD root 'home#index' <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ActiveAdmin.routes(self) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) }
    4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
    5. 1 context 'when decorate' do
    6. 1 it '#full_name' do
    7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    8. end
    9. end
    10. end
    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

    spec/decorators/author_decorator_spec.rb

    =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true)
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased)
    5. <<<<<<< HEAD
    6. =======
    7. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
    8. 1 context 'when decorate' do
    9. 1 it '#full_name' do
    10. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    11. end
    12. end
    13. ======= >>>>>>> 7a02bbe (Featire specs) end
    <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. >>>>>>> e5752db (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD resources :books, only: %i[show index]
    3. >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD authenticate :admin_user do ======= ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) resources :books, only: %i[show index] >>>>>>> c7a726c5 (Rebased)
    4. <<<<<<< HEAD <<<<<<< HEAD =======
    5. ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)
    6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
      3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
      ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      =======

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) } ======= ======= <<<<<<< HEAD resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) resources :books, only: %i[show index]
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs)
      5. ======= ======= >>>>>>> 22ee41c (Add login registration pages) =======
      6. ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      7. ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      8. =======
      9. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
      10. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) } >>>>>>> 84003439 (Featire specs)
      4. <<<<<<< HEAD
      5. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 84003439 (Featire specs) devise_for :users >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD resources :books, only: %i[show index] >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e055dd0 (Rebased) devise_for :users >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= devise_for :users >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
      7. 1 devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
      8. 1 ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) root 'home#index'
      9. <<<<<<< HEAD <<<<<<< HEAD
      10. 1 resources :users
      11. >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs)
      12. =======
      13. >>>>>>> 6da9530 (Featire specs) =======
      14. >>>>>>> 495b04d (Fix book_spec decrease quantity and price) =======
      15. >>>>>>> 9e081dc (Fix) <<<<<<< HEAD
      16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      17. ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price)
      18. >>>>>>> 6da9530 (Featire specs) =======
      19. >>>>>>> 9e081dc (Fix) 1 devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      21. =======
      22. >>>>>>> 6da9530 (Featire specs) =======
      23. >>>>>>> 495b04d (Fix book_spec decrease quantity and price) =======
      24. >>>>>>> 9e081dc (Fix)
      25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      26. ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price)
      27. >>>>>>> 6da9530 (Featire specs) =======
      28. >>>>>>> 9e081dc (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) root 'home#index'
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price)
      30. =======
      31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
      32. >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price)
      33. <<<<<<< HEAD <<<<<<< HEAD
      34. =======
      35. >>>>>>> 6da9530 (Featire specs) =======
      36. >>>>>>> 495b04d (Fix book_spec decrease quantity and price) 1 resources :users
      37. <<<<<<< HEAD <<<<<<< HEAD
      38. <<<<<<< HEAD
      39. 1 =======
      40. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) resources :books, only: %i[show index] do
      41. <<<<<<< HEAD
      42. 1 =======
      43. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix)
      44. 1 resources :orders, only: %i[index] do
      45. 1 get '/add_to_order', to: 'order_books#add_to_order'
      46. 1 delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
      47. 1 put '/order_update_book', to: 'order_books#update_quantity'
      48. end
      49. 1 get '/coupon_check', to: 'coupons#find'
      50. 1 resources :users
      51. 1 resources :books, only: %i[show index] do
      52. 1 resources :reviews, only: :create
      53. end
      54. ======= >>>>>>> bae2b7de (Add login registration pages) end
      <<<<<<< HEAD <<<<<<< HEAD
      >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

      spec/decorators/author_decorator_spec.rb

      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      =======

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) }
      4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
      5. 1 context 'when decorate' do
      6. 1 it '#full_name' do
      7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
      8. end
      9. end
      10. end
      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

      spec/decorators/author_decorator_spec.rb

      ======= =======

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) }
      4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
      5. 1 context 'when decorate' do
      6. 1 it '#full_name' do
      7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
      8. end
      9. end
      10. ======= >>>>>>> 7a02bbe (Featire specs) end
      <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } ======= let(:book_decorator) { described_class.new(book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
      4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      5. <<<<<<< HEAD
      6. 2 ======= ======= >>>>>>> 5b7749a (Fix)
      7. 1 mount Sidekiq::Web => '/sidekiq'
      8. end
      9. 1 ActiveAdmin.routes(self)
      10. <<<<<<< HEAD end
      11. end
      12. <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) end
      <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true) =======

      spec/decorators/author_decorator_spec.rb

      >>>>>>> c7a726c5 (Rebased)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. ======= >>>>>>> 5b7749a (Fix)
      3. <<<<<<< HEAD
      4. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
      5. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs)
      6. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      8. =======
      9. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD resources :books, only: %i[show index]
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) end
      >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD root 'home#index' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      =======

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) }
      4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
      5. 1 context 'when decorate' do
      6. 1 it '#full_name' do
      7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
      8. end
      9. end
      10. ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) end
      <<<<<<< HEAD
      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      >>>>>>> 610b6138 (Featire specs)

      spec/decorators/author_decorator_spec.rb

      =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true)
      4. <<<<<<< HEAD
      5. =======
      6. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
      7. 1 context 'when decorate' do
      8. 1 it '#full_name' do
      9. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
      10. end
      11. end
      12. ======= >>>>>>> 7a02bbe (Featire specs) end
      <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. >>>>>>> e5752db (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD resources :books, only: %i[show index]
      3. <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
      =======

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) }
      4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
      5. 1 context 'when decorate' do
      6. 1 it '#full_name' do
      7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
      8. end
      9. end
      10. end
      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

      spec/decorators/author_decorator_spec.rb

      =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) RSpec.describe AuthorDecorator do
      3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
      4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      5. 1 <<<<<<< HEAD ======= context 'when decorate' do
      6. 1 it '#full_name' do
      7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
      8. end
      9. end
      10. ======= >>>>>>> 7a02bbe (Featire specs) end
      <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 5 relevant lines. 5 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
          
      1. 1 RSpec.describe AuthorDecorator, type: :decorator do
      2. <<<<<<< HEAD
      3. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
      4. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      5. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      6. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) resources :books, only: %i[show index]
      7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs)
      8. ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      9. ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======
      10. ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      11. =======
      12. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
      13. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) }
      4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD =======
      5. 1 devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
      6. 1 <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) devise_for :users >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD
      7. =======
      8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
      9. 1 resources :users >>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
      10. <<<<<<< HEAD
      11. 1 =======
      12. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
      13. <<<<<<< HEAD
      14. ======= <<<<<<< HEAD
      15. >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) 1 =======
      16. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 11792758 (Rebased) root 'home#index'
      17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased)
      18. 1 resources :users
      19. 1 resources :books, only: %i[show index] do
      20. 1 <<<<<<< HEAD =======
      21. ======= ======= >>>>>>> 5b7749a (Fix)
      22. ======= >>>>>>> 11792758 (Rebased)
      23. <<<<<<< HEAD
      24. 1 resources :orders, only: %i[index] do
      25. 1 get '/add_to_order', to: 'order_books#add_to_order'
      26. 1 delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
      27. 1 put '/order_update_book', to: 'order_books#update_quantity'
      28. =======
      29. >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      30. >>>>>>> 11792758 (Rebased) end
      31. <<<<<<< HEAD <<<<<<< HEAD
      32. 1 get '/coupon_check', to: 'coupons#find'
      33. 1 resources :users
      34. 1 resources :books, only: %i[show index] do
      35. 1 resources :reviews, only: :create
      36. end
      37. =======
      38. >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      39. >>>>>>> 11792758 (Rebased) end
      <<<<<<< HEAD
      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix)
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)

      spec/decorators/author_decorator_spec.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d9d85ca6 (Fix) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 02a399d (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 183b6c5 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) =======

      spec/decorators/author_decorator_spec.rb

      >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD
      >>>>>>> c033601 (Rebased)

      spec/decorators/author_decorator_spec.rb

      <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> ef483b6d (Fix) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 02a399d (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 183b6c5 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======

      spec/decorators/author_decorator_spec.rb

      >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)

      spec/decorators/author_decorator_spec.rb

      ======= >>>>>>> b15044a (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD
      >>>>>>> c033601 (Rebased)

      spec/decorators/author_decorator_spec.rb

      <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 02a399d (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 183b6c5 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> fd6db03 (Manifest_cache true) =======

      spec/decorators/author_decorator_spec.rb

      >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)

      spec/decorators/author_decorator_spec.rb

      ======= >>>>>>> b15044a (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) 5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 12 relevant lines. 12 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> 2c640cf (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) 5 relevant lines. 5 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> 845dac1 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) 5 relevant lines. 5 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> fdab719f (Fix) ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) ======= 5 relevant lines. 5 lines covered and <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD RSpec.describe AuthorDecorator, type: :decorator do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator, type: :decorator do ======= ======= RSpec.describe AuthorDecorator, type: :decorator do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= >>>>>>> c8da2e3 (Fix) require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) ======= require 'rails_helper' >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= require 'rails_helper' >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= require 'rails_helper' >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
      2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix)
      3. 2 subject(:decorated_object) { described_class.new(author) }
      4. <<<<<<< HEAD ======= ======= ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD
      5. >>>>>>> 9a49b7b (Rebased) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true)
      6. 2 >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD
      7. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
      8. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
      9. 2 >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
      10. 2 >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix)
      11. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
      12. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
      13. 2 >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
      14. 2 >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      15. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      16. 2 ======= ======= >>>>>>> 5b7749a (Fix)
      17. 1 >>>>>>> 824bb2b (Featire specs) =======
      18. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      19. 1 >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix)
      20. 2 ======= ======= >>>>>>> 5b7749a (Fix)
      21. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= =======
      22. 1 >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= =======
      23. 1 >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) let(:author) { create(:author) } ======= RSpec.describe BookDecorator do >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe BookDecorator do >>>>>>> 0d6dd12 (Manifest_cache true) ======= RSpec.describe BookDecorator do >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= RSpec.describe BookDecorator do >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      25. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      26. ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      27. 3 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } ======= <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> bd8bda4 (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> aa7b40c (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      28. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      29. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
      30. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      31. <<<<<<< HEAD =======
      32. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      33. >>>>>>> bd8bda4 (Manifest_cache true) =======
      34. >>>>>>> aa7b40c (Manifest_cache true) =======
      35. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      36. >>>>>>> 02a399d (Manifest_cache true) =======
      37. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      38. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) =======
      39. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      40. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      41. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      42. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      43. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      44. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
      45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      46. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD
      47. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      48. ======= <<<<<<< HEAD
      49. =======
      50. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      51. >>>>>>> bd8bda4 (Manifest_cache true) =======
      52. >>>>>>> aa7b40c (Manifest_cache true) =======
      53. >>>>>>> 183b6c5 (Manifest_cache true) =======
      54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) describe '#full_name' do ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:authors) do >>>>>>> 0d6dd12 (Manifest_cache true) ======= let(:authors) do >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= let(:authors) do >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      55. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      56. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
      57. <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      58. ======= <<<<<<< HEAD
      59. =======
      60. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      61. >>>>>>> bd8bda4 (Manifest_cache true) =======
      62. >>>>>>> aa7b40c (Manifest_cache true) =======
      63. >>>>>>> 183b6c5 (Manifest_cache true) =======
      64. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) end ======= [ >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= [ >>>>>>> 0d6dd12 (Manifest_cache true) ======= [ >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= [ >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      65. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD
      66. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs)
      67. <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      68. ======= <<<<<<< HEAD
      69. =======
      70. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      71. >>>>>>> bd8bda4 (Manifest_cache true) =======
      72. >>>>>>> aa7b40c (Manifest_cache true) =======
      73. >>>>>>> 183b6c5 (Manifest_cache true) =======
      74. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true)
      75. >>>>>>> c033601 (Rebased) 2 =======
      76. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      77. >>>>>>> c033601 (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) >>>>>>> 824bb2b (Featire specs) ======= =======
      78. 2 >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) subject(:decorated_object) { described_class.new(author) }
      79. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      80. ======= <<<<<<< HEAD
      81. =======
      82. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      83. >>>>>>> bd8bda4 (Manifest_cache true) =======
      84. >>>>>>> aa7b40c (Manifest_cache true) =======
      85. >>>>>>> 183b6c5 (Manifest_cache true) =======
      86. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= =======
      88. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) =======
      89. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      90. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      91. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      92. ======= <<<<<<< HEAD
      93. =======
      94. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      95. >>>>>>> bd8bda4 (Manifest_cache true) =======
      96. >>>>>>> aa7b40c (Manifest_cache true) =======
      97. >>>>>>> 183b6c5 (Manifest_cache true) =======
      98. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      99. 2 =======
      100. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      101. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      102. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      103. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      104. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) let(:author) { create(:author) } <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) RSpec.describe BookDecorator do ======= >>>>>>> 5b7749a (Fix)
      105. <<<<<<< HEAD
      106. 3 <<<<<<< HEAD <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      107. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      108. >>>>>>> bd8bda4 (Manifest_cache true) =======
      109. >>>>>>> aa7b40c (Manifest_cache true) =======
      110. >>>>>>> 183b6c5 (Manifest_cache true) =======
      111. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      112. ======= ======= >>>>>>> b15044a (Manifest_cache true)
      113. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      114. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      115. >>>>>>> 7c4ea7f (Fix)
      116. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) describe '#full_name' do
      117. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
      118. <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= end
      119. end

      spec/decorators/book_decorator_spec.rb

      100.0% lines covered

      15 relevant lines. 15 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BookDecorator do
      2. 4 subject(:decorated_object) { described_class.new(book) }
      3. 1 let(:book) do
      4. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
      5. categories_count: 0,
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      7. =======
      8. >>>>>>> ae2a012 (Manifest_cache true) =======
      9. >>>>>>> 998f08d (Manifest_cache true) 1 <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
      11. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) authors_count: 0) ======= [ >>>>>>> 02a399d (Manifest_cache true) ======= [ >>>>>>> bd8bda4 (Manifest_cache true) ======= [ >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= [ >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= [ >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= [ >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= [ >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= authors_count: 0) >>>>>>> 5b7749a (Fix)
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix)
      13. <<<<<<< HEAD =======
      14. 2 >>>>>>> 02a399d (Manifest_cache true) =======
      15. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      16. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      17. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      18. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      19. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) end ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= end >>>>>>> 5b7749a (Fix)
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      21. 1 =======
      22. >>>>>>> 02a399d (Manifest_cache true) =======
      23. =======
      24. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) =======
      25. >>>>>>> bd8bda4 (Manifest_cache true) =======
      26. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      27. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      28. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      29. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      30. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) let(:authors) do ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= let(:authors) do >>>>>>> 5b7749a (Fix)
      31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      32. =======
      33. >>>>>>> ae2a012 (Manifest_cache true) =======
      34. >>>>>>> bd8bda4 (Manifest_cache true) =======
      35. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      36. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      37. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      38. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      39. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      40. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) [
      41. 3 create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
      42. create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
      43. ======= >>>>>>> 6da9530 (Featire specs)
      44. =======
      45. >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) =======
      46. <<<<<<< HEAD
      47. 1 =======
      48. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) resources :books, only: %i[show index] do
      49. <<<<<<< HEAD
      50. 1 =======
      51. =======
      52. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d59aaa (Fix)
      53. >>>>>>> 9e081dc (Fix)
      54. 1 resources :orders, only: %i[index] do
      55. 1 get '/add_to_order', to: 'order_books#add_to_order'
      56. 1 delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
      57. 1 put '/order_update_book', to: 'order_books#update_quantity'
      58. end
      59. 1 get '/coupon_check', to: 'coupons#find'
      60. 1 resources :users
      61. 1 resources :books, only: %i[show index] do
      62. 1 resources :reviews, only: :create
      63. end
      64. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ] ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      ======= <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)
      >>>>>>> c033601 (Rebased)

      spec/decorators/author_decorator_spec.rb

      <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d59aaa (Fix) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 02a399d (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 183b6c5 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======

      spec/decorators/author_decorator_spec.rb

      >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true)

      spec/decorators/author_decorator_spec.rb

      ======= >>>>>>> b15044a (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 12 relevant lines. 12 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= ======= >>>>>>> b15044a (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> 2c640cf (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) 5 relevant lines. 5 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> 845dac1 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= 5 relevant lines. 5 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD RSpec.describe AuthorDecorator, type: :decorator do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) ======= require 'rails_helper' >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= ======= require 'rails_helper' >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix)
      3. ======= ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix)
      4. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
      5. 2 >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
      6. <<<<<<< HEAD
      7. 1 RSpec.describe BookDecorator do
      8. 3 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } ======= <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> bd8bda4 (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> aa7b40c (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      9. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      10. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
      11. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      12. <<<<<<< HEAD =======
      13. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      14. >>>>>>> bd8bda4 (Manifest_cache true) =======
      15. >>>>>>> aa7b40c (Manifest_cache true) =======
      16. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= =======
      17. >>>>>>> 02a399d (Manifest_cache true) =======
      18. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      19. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= =======
      20. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= =======
      21. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= =======
      22. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)
      23. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      24. ======= <<<<<<< HEAD
      25. =======
      26. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      27. >>>>>>> bd8bda4 (Manifest_cache true) =======
      28. >>>>>>> aa7b40c (Manifest_cache true) =======
      29. >>>>>>> 183b6c5 (Manifest_cache true) =======
      30. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 1 let(:authors) do
      31. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      32. ======= <<<<<<< HEAD
      33. =======
      34. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      35. >>>>>>> bd8bda4 (Manifest_cache true) =======
      36. >>>>>>> aa7b40c (Manifest_cache true) =======
      37. >>>>>>> 183b6c5 (Manifest_cache true) =======
      38. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) [
      39. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      40. ======= <<<<<<< HEAD
      41. =======
      42. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      43. >>>>>>> bd8bda4 (Manifest_cache true) =======
      44. >>>>>>> aa7b40c (Manifest_cache true) =======
      45. >>>>>>> 183b6c5 (Manifest_cache true) =======
      46. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      47. >>>>>>> c033601 (Rebased) 2 =======
      48. 2 >>>>>>> a5d032d (Fix) subject(:decorated_object) { described_class.new(author) } >>>>>>> 6da9530 (Featire specs)
      49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
      50. <<<<<<< HEAD =======
      51. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      52. ======= <<<<<<< HEAD
      53. =======
      54. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      55. >>>>>>> bd8bda4 (Manifest_cache true) =======
      56. >>>>>>> aa7b40c (Manifest_cache true) =======
      57. >>>>>>> 183b6c5 (Manifest_cache true) =======
      58. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      59. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= =======
      60. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) =======
      61. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= =======
      62. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
      63. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      64. ======= <<<<<<< HEAD
      65. =======
      66. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      67. >>>>>>> bd8bda4 (Manifest_cache true) =======
      68. >>>>>>> aa7b40c (Manifest_cache true) =======
      69. >>>>>>> 183b6c5 (Manifest_cache true) =======
      70. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
      71. 2 =======
      72. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
      73. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
      74. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
      75. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
      76. 2 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) let(:author) { create(:author) } <<<<<<< HEAD ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) RSpec.describe BookDecorator do >>>>>>> 0b43b18 (Manifest_cache true)
      77. <<<<<<< HEAD
      78. 3 <<<<<<< HEAD <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true)
      79. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      80. ======= <<<<<<< HEAD
      81. =======
      82. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= =======
      83. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
      84. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      85. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      86. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      87. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
      88. >>>>>>> aa7b40c (Manifest_cache true) =======
      89. >>>>>>> 183b6c5 (Manifest_cache true) =======
      90. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= =======
      91. ======= ======= >>>>>>> b15044a (Manifest_cache true)
      92. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      93. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      94. >>>>>>> 7c4ea7f (Fix)
      95. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) describe '#full_name' do
      96. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
      97. <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= end
      98. end

      spec/decorators/book_decorator_spec.rb

      100.0% lines covered

      15 relevant lines. 15 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BookDecorator do
      2. 4 subject(:decorated_object) { described_class.new(book) }
      3. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs)
      4. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) let(:book) do ======= resources :books, only: %i[show index] >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs)
      5. <<<<<<< HEAD
      6. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 3e9f99d (Featire specs)
      7. <<<<<<< HEAD
      8. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
      9. categories_count: 0,
      10. <<<<<<< HEAD ======= <<<<<<< HEAD
      11. =======
      12. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true)
      13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true)
      14. <<<<<<< HEAD authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD authors_count: 0) ======= [ >>>>>>> 02a399d (Manifest_cache true) ======= [ >>>>>>> bd8bda4 (Manifest_cache true) ======= [ >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true)
      15. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true)
      16. <<<<<<< HEAD ======= =======
      17. 2 >>>>>>> 02a399d (Manifest_cache true) =======
      18. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      19. 2 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true)
      20. <<<<<<< HEAD
      21. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      22. 1 =======
      23. >>>>>>> 02a399d (Manifest_cache true) =======
      24. =======
      25. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) =======
      26. >>>>>>> bd8bda4 (Manifest_cache true) =======
      27. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:authors) do ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true)
      28. <<<<<<< HEAD
      29. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      30. =======
      31. >>>>>>> ae2a012 (Manifest_cache true) =======
      32. >>>>>>> bd8bda4 (Manifest_cache true) =======
      33. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) [
      34. 3 create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
      35. create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
      36. <<<<<<< HEAD ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ]
      37. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true)
      38. <<<<<<< HEAD =======
      39. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= =======
      40. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= =======
      41. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) ======= ======= =======
      42. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= =======
      43. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= =======
      44. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= =======
      45. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) end
      46. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD
      47. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true)
      48. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      49. ======= <<<<<<< HEAD
      50. =======
      51. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= =======
      52. >>>>>>> bd8bda4 (Manifest_cache true) =======
      53. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      54. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      55. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
      56. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= =======
      57. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      58. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      59. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      60. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= =======
      61. >>>>>>> 183b6c5 (Manifest_cache true) =======
      62. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= =======
      63. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= =======
      64. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= =======
      65. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) ======= =======
      66. >>>>>>> 7c4ea7f (Fix) >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) 1 let(:categories) do
      67. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD
      68. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true)
      69. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      70. ======= <<<<<<< HEAD
      71. =======
      72. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= =======
      73. >>>>>>> bd8bda4 (Manifest_cache true) =======
      74. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      75. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
      77. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= =======
      78. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      79. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      80. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      81. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= =======
      82. >>>>>>> 183b6c5 (Manifest_cache true) =======
      83. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= =======
      84. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= =======
      85. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= =======
      86. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) ======= =======
      87. >>>>>>> 7c4ea7f (Fix) >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) [
      88. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      89. 3 >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      90. ======= <<<<<<< HEAD
      91. =======
      92. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      93. >>>>>>> bd8bda4 (Manifest_cache true) =======
      94. >>>>>>> aa7b40c (Manifest_cache true) =======
      95. >>>>>>> 183b6c5 (Manifest_cache true) =======
      96. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 84003439 (Featire specs)
      97. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) =======
      98. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 551c6ab (Manifest_cache true)
      99. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      100. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      101. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      102. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
      103. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 56531f25 (Manifest_cache true) =======
      104. >>>>>>> c033601 (Rebased) 2 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 551c6ab (Manifest_cache true) =======
      105. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      106. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      107. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      108. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      109. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      110. 3 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      111. >>>>>>> c033601 (Rebased) 2 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) =======
      112. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= =======
      113. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= =======
      114. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= =======
      115. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======
      116. 3 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> d365be68 (Manifest_cache true) let(:author) { create(:author) } <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) create(:category, name: FFaker::Book.genre), >>>>>>> 2722d07 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 96aecde (Manifest_cache true) ======= ======= <<<<<<< HEAD let(:author) { create(:author) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= let(:author) { create(:author) } ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:author) { create(:author) } ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD let(:author) { create(:author) } ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) create(:category, name: FFaker::Book.genre), >>>>>>> 2722d07 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> cc390719 (Manifest_cache true) RSpec.describe BookDecorator do ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= let(:author) { create(:author) } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= let(:author) { create(:author) } >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= let(:author) { create(:author) } >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= let(:author) { create(:author) } >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true)
      117. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD
      118. >>>>>>> 0b43b18 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix)
      119. 3 <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)
      120. <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      121. 3 <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true)
      122. <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD
      123. 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
      124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      125. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
      126. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      127. ======= <<<<<<< HEAD
      128. =======
      129. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= =======
      130. >>>>>>> bd8bda4 (Manifest_cache true) =======
      131. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD =======
      132. >>>>>>> 183b6c5 (Manifest_cache true) =======
      133. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      134. <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e18eb87 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
      135. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      136. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      137. >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
      138. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= =======
      139. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      140. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) =======
      141. >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= =======
      142. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 551c6ab (Manifest_cache true) ======= =======
      143. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
      144. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
      145. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      146. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      147. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      148. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      149. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= =======
      150. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) ======= =======
      151. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 42e9c2e (Manifest_cache true) ======= =======
      152. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> c0159bf (Manifest_cache true) ======= =======
      153. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) ======= =======
      154. >>>>>>> 7c4ea7f (Fix) >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> ca274ec (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) create(:category, name: FFaker::Book.genre) <<<<<<< HEAD ======= create(:category, name: FFaker::Book.genre) >>>>>>> 551c6ab (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      155. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> d365be68 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true)
      156. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
      157. >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> fd310ed (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true)
      158. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true)
      159. =======
      160. =======
      161. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 56531f25 (Manifest_cache true) =======
      162. >>>>>>> bd8bda4 (Manifest_cache true) =======
      163. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      164. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      165. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
      166. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
      167. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      168. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      169. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
      170. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
      171. >>>>>>> 7c4ea7f (Fix) =======
      172. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      173. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 1 >>>>>>> c033601 (Rebased) =======
      174. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 1 >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 1cce66c (Manifest_cache true) =======
      175. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      176. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
      177. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= =======
      178. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      179. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
      180. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
      181. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 0b43b18 (Manifest_cache true) =======
      182. =======
      183. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= =======
      184. 1 >>>>>>> a5d032d (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) describe '#full_name' do
      185. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true)
      186. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
      187. >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> fd310ed (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true)
      188. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      189. ======= <<<<<<< HEAD
      190. =======
      191. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= =======
      192. >>>>>>> bd8bda4 (Manifest_cache true) =======
      193. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      194. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 1cce66c (Manifest_cache true) =======
      195. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true)
      196. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      197. >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      198. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      199. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      200. >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
      201. [
      202. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      203. >>>>>>> a5d032d (Fix) <<<<<<< HEAD =======
      204. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
      205. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= =======
      206. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      207. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
      208. >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) =======
      209. >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= =======
      210. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
      211. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix)
      212. >>>>>>> c033601 (Rebased) =======
      213. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      214. >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= =======
      215. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= =======
      216. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      217. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      218. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      219. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) =======
      220. >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= =======
      221. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= =======
      222. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) ======= =======
      223. >>>>>>> 7c4ea7f (Fix) >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) end
      224. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      225. ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      226. >>>>>>> c59d1a99 (Manifest_cache true) 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      227. <<<<<<< HEAD
      228. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      229. >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      230. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) =======
      231. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= =======
      232. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      233. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      234. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      235. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      236. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      237. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      238. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      239. ======= ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD
      240. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      241. =======
      242. >>>>>>> 02a399d (Manifest_cache true) =======
      243. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= =======
      244. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      245. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      246. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      247. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      248. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      249. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD describe '#categories_names' do >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) it '#authors_names' do ======= <<<<<<< HEAD context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) describe '#full_name' do ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= it '#authors_names' do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= describe '#categories_names' do >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      250. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      251. =======
      252. >>>>>>> c7a726c5 (Rebased) 2 ======= ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD
      253. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      254. 2 =======
      255. 1 >>>>>>> 02a399d (Manifest_cache true) =======
      256. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= =======
      257. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      258. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      259. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      260. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      261. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      262. 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      263. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      264. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      265. 1 =======
      266. >>>>>>> fd6db03 (Manifest_cache true) =======
      267. >>>>>>> 998f08d (Manifest_cache true) =======
      268. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> 998f08d (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 6da9530 (Featire specs)
      269. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) end
      270. 1 it '#categories_names' do
      271. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      272. end
      273. =======
      274. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      275. >>>>>>> bd8bda4 (Manifest_cache true) =======
      276. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      277. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      278. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      279. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      280. <<<<<<< HEAD ======= <<<<<<< HEAD
      281. ======= >>>>>>> 7375d4b (Manifest_cache true)
      282. end
      283. 1 it '#categories_names' do
      284. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      285. end
      286. >>>>>>> bd30d038 (Manifest_cache true) end
      287. <<<<<<< HEAD ======= <<<<<<< HEAD
      288. <<<<<<< HEAD ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
      289. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
      290. <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= =======
      291. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
      292. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= =======
      293. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      294. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      295. >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      296. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= =======
      297. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= =======
      298. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      299. >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
      300. ]
      301. end
      302. 1 let(:categories) do
      303. [
      304. 2 FactoryBot.create(:category, name: 'Poetry'),
      305. FactoryBot.create(:category, name: 'Novel')
      306. ]
      307. end
      308. ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price)
      309. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) =======
      310. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
      311. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
      312. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
      313. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
      314. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
      315. >>>>>>> 7c4ea7f (Fix) ======= =======
      316. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true)
      317. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      318. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD
      319. =======
      320. >>>>>>> 02a399d (Manifest_cache true) =======
      321. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
      322. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
      323. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
      324. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
      325. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
      326. >>>>>>> 7c4ea7f (Fix) ======= =======
      327. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) 1 <<<<<<< HEAD context 'when decorate' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) describe '#categories_names' do >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) it '#authors_names' do ======= <<<<<<< HEAD context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) ======= ======= ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= ======= it '#authors_names' do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= describe '#categories_names' do >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      328. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      329. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD
      330. 2 =======
      331. 1 >>>>>>> 02a399d (Manifest_cache true) =======
      332. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) =======
      333. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
      334. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
      335. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
      336. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
      337. 2 >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD it '#authors_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      338. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      339. ======= <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      340. 1 =======
      341. >>>>>>> fd6db03 (Manifest_cache true) =======
      342. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> 998f08d (Manifest_cache true)
      343. <<<<<<< HEAD <<<<<<< HEAD end
      344. 1 it '#categories_names' do
      345. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      346. end
      347. <<<<<<< HEAD ======= =======
      348. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      349. >>>>>>> bd8bda4 (Manifest_cache true) =======
      350. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD =======
      351. >>>>>>> 183b6c5 (Manifest_cache true) =======
      352. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      353. <<<<<<< HEAD ======= <<<<<<< HEAD
      354. ======= >>>>>>> 7375d4b (Manifest_cache true)
      355. end
      356. 1 it '#categories_names' do
      357. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      358. end
      359. <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) end
      360. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      361. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
      362. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
      363. >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
      364. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
      365. ]
      366. end
      367. 1 let(:categories) do
      368. [
      369. 2 FactoryBot.create(:category, name: 'Poetry'),
      370. FactoryBot.create(:category, name: 'Novel')
      371. ]
      372. end
      373. 1 context 'when decorate' do
      374. 1 it '#authors_names' do
      375. 1 expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      376. end
      377. 1 it '#categories_names' do
      378. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      379. end
      380. end
      381. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) end
      <<<<<<< HEAD
      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= =======
      >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= =======
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
      >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true)
      >>>>>>> c033601 (Rebased) =======
      >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      >>>>>>> a5d032d (Fix) >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix)

      spec/decorators/book_decorator_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= 15 relevant lines. 15 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= 15 relevant lines. 15 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 15 relevant lines. 15 lines covered and >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) 0 lines missed.
          
      1. 1 RSpec.describe BookDecorator do
      2. 4 subject(:decorated_object) { described_class.new(book) }
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) >>>>>>> 53db2224 (Featire specs)
      4. 1 <<<<<<< HEAD let(:book) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> a71befd (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5e31aeb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> a71befd (Manifest_cache true) let(:book) do ======= resources :books, only: %i[show index] >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e18eb87 (Fix) resources :books, only: %i[show index] >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe BookDecorator do ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= ======= RSpec.describe BookDecorator do
      5. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true)
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs)
      7. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs)
      8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs)
      9. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
      10. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      11. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
      12. <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) >>>>>>> 53db2224 (Featire specs)
      13. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
      14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true)
      15. >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= =======
      16. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) <<<<<<< HEAD categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a71befd (Manifest_cache true) categories_count: 0, ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) categories_count: 0, ======= <<<<<<< HEAD ======= categories_count: 0, ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) categories_count: 0, ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= categories_count: 0, ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= categories_count: 0, ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= categories_count: 0, >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= categories_count: 0, ======= ======= ======= categories_count: 0, <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= categories_count: 0, ======= =======
      17. <<<<<<< HEAD
      18. =======
      19. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true)
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      21. =======
      22. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      23. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      24. =======
      25. >>>>>>> ae2a012 (Manifest_cache true) =======
      26. >>>>>>> 998f08d (Manifest_cache true) 1 <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      27. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) authors_count: 0) ======= ======= authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) [ >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= [ >>>>>>> bd8bda4 (Manifest_cache true) ======= [ >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= [ >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= [ >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= [ >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= [ >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= authors_count: 0) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= authors_count: 0) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      29. ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      30. >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD
      31. >>>>>>> fdab719f (Fix) ======= >>>>>>> 5b7749a (Fix)
      32. <<<<<<< HEAD =======
      33. 2 >>>>>>> 02a399d (Manifest_cache true) =======
      34. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      35. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      36. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      37. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      38. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      39. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      40. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix)
      41. <<<<<<< HEAD ======= =======
      42. 2 >>>>>>> 02a399d (Manifest_cache true) =======
      43. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      44. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD =======
      45. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
      46. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
      47. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= =======
      48. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      49. >>>>>>> ae2a012 (Manifest_cache true) =======
      50. 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) end ======= ======= end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) end ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= end >>>>>>> 5b7749a (Fix) ======= subject(:decorated_object) { described_class.new(author) } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= end >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= end >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      51. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      52. 1 ======= =======
      53. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      54. 1 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      55. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      56. =======
      57. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      58. >>>>>>> bd8bda4 (Manifest_cache true) =======
      59. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      60. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      61. =======
      62. >>>>>>> c7a726c5 (Rebased) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      63. <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      64. 1 >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      65. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      66. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) let(:authors) do ======= ======= let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= let(:authors) do >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      67. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      68. ======= =======
      69. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      70. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      71. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
      72. >>>>>>> bd8bda4 (Manifest_cache true) =======
      73. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      74. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) =======
      75. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      76. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      77. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      78. >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      79. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      80. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      81. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) [
      82. <<<<<<< HEAD
      83. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)
      84. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD
      85. 3 ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      86. =======
      87. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      88. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      89. 3 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
      90. <<<<<<< HEAD
      91. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      92. ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
      93. ======= <<<<<<< HEAD <<<<<<< HEAD
      94. ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      95. ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      96. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
      97. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      98. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      99. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
      100. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ]
      101. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      102. <<<<<<< HEAD ======= =======
      103. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
      104. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      105. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      106. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
      107. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      108. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      109. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      110. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
      111. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      112. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      113. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      114. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      115. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      116. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= =======
      117. ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      118. ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix)
      119. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= <<<<<<< HEAD
      120. =======
      121. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) =======
      122. >>>>>>> bd8bda4 (Manifest_cache true) =======
      123. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      124. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      125. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
      126. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      127. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      128. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      129. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      130. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      131. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      132. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      133. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) 1 let(:categories) do
      134. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix)
      135. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= =======
      136. ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      137. ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix)
      138. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= <<<<<<< HEAD
      139. =======
      140. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) =======
      141. >>>>>>> bd8bda4 (Manifest_cache true) =======
      142. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      143. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      144. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
      145. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      146. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      147. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      148. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      149. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      150. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      151. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      152. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) [
      153. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix)
      154. 3 >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= =======
      155. 3 ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      156. 3 ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix)
      157. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
      158. =======
      159. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      160. >>>>>>> bd8bda4 (Manifest_cache true) =======
      161. >>>>>>> aa7b40c (Manifest_cache true) =======
      162. >>>>>>> 183b6c5 (Manifest_cache true) =======
      163. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true)
      164. >>>>>>> c033601 (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      165. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD
      166. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
      167. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
      168. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
      169. >>>>>>> c033601 (Rebased) 2 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      170. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) =======
      171. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) =======
      172. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      173. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      174. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      175. 3 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      176. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      177. 3 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) let(:author) { create(:author) } ======= ======= <<<<<<< HEAD let(:author) { create(:author) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:author) { create(:author) } ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD let(:author) { create(:author) } ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) create(:category, name: FFaker::Book.genre), >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD create(:category, name: FFaker::Book.genre), >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre), ======= >>>>>>> c8da2e3 (Fix) FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) RSpec.describe BookDecorator do ======= let(:author) { create(:author) } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= let(:author) { create(:author) } >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
      178. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      179. >>>>>>> 31d15e66 (Fix) =======
      180. >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      181. 3 <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true)
      182. <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD
      183. 3 <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      184. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      185. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      186. ======= <<<<<<< HEAD
      187. =======
      188. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      189. >>>>>>> bd8bda4 (Manifest_cache true) =======
      190. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD =======
      191. >>>>>>> 183b6c5 (Manifest_cache true) =======
      192. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      193. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      194. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      195. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      196. >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
      197. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= =======
      198. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      199. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= =======
      200. >>>>>>> bd8bda4 (Manifest_cache true) =======
      201. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      202. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      203. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      204. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      205. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      206. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      207. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      208. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) create(:category, name: FFaker::Book.genre) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true)
      209. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) =======
      210. ======= =======
      211. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      212. >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      213. >>>>>>> 2722d07 (Manifest_cache true) =======
      214. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      215. ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD
      216. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
      217. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
      218. >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      219. ======= <<<<<<< HEAD
      220. =======
      221. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      222. >>>>>>> bd8bda4 (Manifest_cache true) =======
      223. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      224. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      225. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD =======
      226. ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      227. =======
      228. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      229. >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) =======
      230. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      231. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) =======
      232. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      233. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      234. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
      235. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
      236. >>>>>>> 7c4ea7f (Fix) ======= =======
      237. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      238. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) =======
      239. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      240. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 1 >>>>>>> c033601 (Rebased) =======
      241. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 1 >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD create(:category, name: FFaker::Book.genre) ======= ======= create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre) ======= >>>>>>> c8da2e3 (Fix) FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) describe '#full_name' do ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true)
      242. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) =======
      243. ======= =======
      244. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      245. ======= >>>>>>> c8da2e3 (Fix)
      246. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
      247. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
      248. >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      249. ======= <<<<<<< HEAD
      250. =======
      251. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      252. >>>>>>> bd8bda4 (Manifest_cache true) =======
      253. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) <<<<<<< HEAD ======= =======
      254. >>>>>>> bd8bda4 (Manifest_cache true) =======
      255. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      256. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      257. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      258. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      259. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      260. >>>>>>> e3e66f3 (Featire specs) =======
      261. [
      262. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      263. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      264. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
      265. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= =======
      266. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      267. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
      268. >>>>>>> c7a726c5 (Rebased) 2 ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> fdab719f (Fix) <<<<<<< HEAD it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") } ======= let(:author) { create(:author) } >>>>>>> c7a726c5 (Rebased)
      269. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
      270. ======= =======
      271. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      272. ======= >>>>>>> c8da2e3 (Fix)
      273. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      274. >>>>>>> c033601 (Rebased) =======
      275. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      276. >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD =======
      277. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) =======
      278. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD =======
      279. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) =======
      280. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      281. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      282. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      283. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) =======
      284. 1 describe '#full_name' do
      285. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
      286. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      287. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      288. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      289. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) end
      290. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix)
      291. ======= =======
      292. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      293. ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= =======
      294. ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true)
      295. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      296. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true)
      297. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) =======
      298. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
      299. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) =======
      300. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      301. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      302. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      303. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
      304. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      305. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      306. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      307. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= =======
      308. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true)
      309. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      310. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix)
      311. ======= =======
      312. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true)
      313. ======= >>>>>>> c8da2e3 (Fix)
      314. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      315. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
      316. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) =======
      317. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      318. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      319. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      320. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
      321. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      322. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      323. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      324. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) describe '#categories_names' do >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= describe '#categories_names' do ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) describe '#categories_names' do ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) it '#authors_names' do <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= <<<<<<< HEAD context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= it '#authors_names' do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= describe '#categories_names' do >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= describe '#categories_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true)
      325. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      326. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix)
      327. 2 ======= =======
      328. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true)
      329. 2 ======= >>>>>>> c8da2e3 (Fix)
      330. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      331. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) =======
      332. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) =======
      333. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      334. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      335. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      336. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      337. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      338. 2 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= <<<<<<< HEAD it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true)
      339. <<<<<<< HEAD <<<<<<< HEAD =======
      340. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      341. ======= <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true)
      342. 1 =======
      343. =======
      344. =======
      345. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD
      346. >>>>>>> 998f08d (Manifest_cache true) =======
      347. 1 >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD end >>>>>>> 998f08d (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true)
      348. <<<<<<< HEAD <<<<<<< HEAD
      349. ======= <<<<<<< HEAD
      350. =======
      351. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) =======
      352. >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) end
      353. <<<<<<< HEAD ======= <<<<<<< HEAD =======
      354. >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD =======
      355. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      356. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) =======
      357. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= =======
      358. 1 it '#categories_names' do
      359. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      360. end
      361. =======
      362. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) end ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 31d15e66 (Fix) ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)
      363. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true)
      364. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
      365. 1 =======
      366. =======
      367. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) it '#categories_names' do
      368. <<<<<<< HEAD
      369. =======
      370. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true)
      371. <<<<<<< HEAD
      372. end
      373. =======
      374. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      375. >>>>>>> bd8bda4 (Manifest_cache true) =======
      376. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
      377. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      378. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) =======
      379. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      380. <<<<<<< HEAD ======= <<<<<<< HEAD
      381. ======= >>>>>>> 7375d4b (Manifest_cache true)
      382. end
      383. 1 it '#categories_names' do
      384. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      385. end
      386. ======= >>>>>>> c59d1a99 (Manifest_cache true) =======
      387. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      388. <<<<<<< HEAD
      389. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
      390. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 89d7dcd2 (Manifest_cache true)
      391. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      392. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
      393. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= =======
      394. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      395. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      396. >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      397. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= =======
      398. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
      399. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
      400. ]
      401. end
      402. 1 let(:categories) do
      403. [
      404. 2 FactoryBot.create(:category, name: 'Poetry'),
      405. FactoryBot.create(:category, name: 'Novel')
      406. ]
      407. end
      408. 1 context 'when decorate' do
      409. 1 it '#authors_names' do
      410. 1 expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      411. end
      412. 1 it '#categories_names' do
      413. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      414. end
      415. end
      416. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD
      ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= =======
      >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= =======
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
      >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      >>>>>>> c033601 (Rebased) =======
      >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

      spec/decorators/book_decorator_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= 15 relevant lines. 15 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= 15 relevant lines. 15 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 0 lines missed.
          
      1. 1 RSpec.describe BookDecorator do
      2. 4 subject(:decorated_object) { described_class.new(book) }
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      4. 1 <<<<<<< HEAD let(:book) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) let(:book) do ======= resources :books, only: %i[show index] >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) resources :books, only: %i[show index] >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe BookDecorator do
      5. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs)
      7. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs)
      8. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      9. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
      10. <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      11. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      13. >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      14. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= categories_count: 0, ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= categories_count: 0, ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= categories_count: 0, >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= categories_count: 0, ======= =======
      15. <<<<<<< HEAD
      16. =======
      17. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix)
      19. =======
      20. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> cc390719 (Manifest_cache true)
      21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true)
      22. <<<<<<< HEAD authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD authors_count: 0) ======= ======= authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) [ >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) authors_count: 0) ======= [ >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= [ >>>>>>> bd8bda4 (Manifest_cache true) ======= [ >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= [ >>>>>>> 183b6c5 (Manifest_cache true) ======= [ >>>>>>> fd6db03 (Manifest_cache true) ======= authors_count: 0) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= authors_count: 0) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true)
      23. ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      24. >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix)
      25. <<<<<<< HEAD ======= =======
      26. 2 >>>>>>> 02a399d (Manifest_cache true) =======
      27. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      28. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> cc390719 (Manifest_cache true) =======
      29. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
      30. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
      31. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      32. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD
      33. ======= >>>>>>> b28889f (Fix)
      34. >>>>>>> e18eb87 (Fix) <<<<<<< HEAD ======= =======
      35. 2 >>>>>>> 02a399d (Manifest_cache true) =======
      36. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      37. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) =======
      38. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
      39. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
      40. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= =======
      41. ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      42. >>>>>>> ae2a012 (Manifest_cache true) ======= ======= =======
      43. >>>>>>> 3be4d14 (Manifest_cache true) =======
      44. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) =======
      45. 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
      46. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) end ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) end ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= end >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= end >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= end >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true)
      47. <<<<<<< HEAD
      48. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      49. 1 ======= =======
      50. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      51. 1 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      52. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      53. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      54. 1 =======
      55. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) =======
      56. =======
      57. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) =======
      58. >>>>>>> bd8bda4 (Manifest_cache true) =======
      59. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) =======
      60. >>>>>>> 183b6c5 (Manifest_cache true) =======
      61. >>>>>>> fd6db03 (Manifest_cache true) =======
      62. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      63. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
      64. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) <<<<<<< HEAD let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:authors) do ======= ======= let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) let(:authors) do ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) ======= let(:authors) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= let(:authors) do >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true)
      65. <<<<<<< HEAD
      66. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      67. ======= =======
      68. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      69. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      70. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
      71. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      72. =======
      73. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) =======
      74. >>>>>>> bd8bda4 (Manifest_cache true) =======
      75. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) =======
      76. >>>>>>> 183b6c5 (Manifest_cache true) =======
      77. >>>>>>> fd6db03 (Manifest_cache true) =======
      78. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      79. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> b28889f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD =======
      80. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
      81. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) [
      82. <<<<<<< HEAD
      83. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true)
      84. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix)
      85. 3 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix)
      86. =======
      87. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) =======
      88. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 8a3779d4 (Manifest_cache true) =======
      89. 3 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
      90. 3 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
      91. <<<<<<< HEAD
      92. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      93. ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
      94. ======= =======
      95. ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true)
      96. ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      97. ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      98. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
      99. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      100. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
      101. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
      102. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= =======
      103. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
      104. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
      105. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) ]
      106. <<<<<<< HEAD
      107. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      108. ======= =======
      109. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
      110. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      111. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      112. >>>>>>> bd8bda4 (Manifest_cache true) =======
      113. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      114. >>>>>>> 183b6c5 (Manifest_cache true) =======
      115. >>>>>>> fd6db03 (Manifest_cache true) =======
      116. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      117. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
      118. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e18eb87 (Fix)
      119. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true)
      120. =======
      121. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      122. >>>>>>> bd8bda4 (Manifest_cache true) =======
      123. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD =======
      124. >>>>>>> 183b6c5 (Manifest_cache true) =======
      125. >>>>>>> fd6db03 (Manifest_cache true) =======
      126. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> 6da9530 (Featire specs) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 495b04d (Fix book_spec decrease quantity and price)
      127. <<<<<<< HEAD
      128. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      129. ======= =======
      130. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      131. >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      132. >>>>>>> 2722d07 (Manifest_cache true) =======
      133. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      134. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      135. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      136. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      137. >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      138. >>>>>>> 2722d07 (Manifest_cache true) =======
      139. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      140. =======
      141. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) =======
      142. =======
      143. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) =======
      144. >>>>>>> bd8bda4 (Manifest_cache true) =======
      145. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) =======
      146. >>>>>>> 183b6c5 (Manifest_cache true) =======
      147. >>>>>>> fd6db03 (Manifest_cache true) =======
      148. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      149. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      150. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      151. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) 1 let(:categories) do
      152. <<<<<<< HEAD
      153. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      154. ======= =======
      155. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      156. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      157. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      158. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      159. =======
      160. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) =======
      161. =======
      162. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) =======
      163. >>>>>>> bd8bda4 (Manifest_cache true) =======
      164. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) =======
      165. >>>>>>> 183b6c5 (Manifest_cache true) =======
      166. >>>>>>> fd6db03 (Manifest_cache true) =======
      167. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      168. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      169. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      170. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) [
      171. <<<<<<< HEAD
      172. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      173. 3 ======= =======
      174. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      175. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      176. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      177. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      178. 3 =======
      179. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) =======
      180. =======
      181. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) 2 >>>>>>> 02a399d (Manifest_cache true) =======
      182. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      183. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) =======
      184. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
      185. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
      186. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      187. 3 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
      188. 3 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) <<<<<<< HEAD create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:category, name: FFaker::Book.genre), ======= ======= create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre), ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true)
      189. <<<<<<< HEAD
      190. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      191. ======= =======
      192. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      193. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      194. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      195. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      196. =======
      197. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) =======
      198. =======
      199. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) =======
      200. >>>>>>> bd8bda4 (Manifest_cache true) =======
      201. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) =======
      202. >>>>>>> 183b6c5 (Manifest_cache true) =======
      203. >>>>>>> fd6db03 (Manifest_cache true) =======
      204. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      205. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      206. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      207. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) <<<<<<< HEAD create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:category, name: FFaker::Book.genre) ======= ======= create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true)
      208. <<<<<<< HEAD
      209. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      210. ======= =======
      211. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      212. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      213. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      214. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      215. =======
      216. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) =======
      217. =======
      218. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) =======
      219. >>>>>>> bd8bda4 (Manifest_cache true) =======
      220. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) =======
      221. >>>>>>> 183b6c5 (Manifest_cache true) =======
      222. >>>>>>> fd6db03 (Manifest_cache true) =======
      223. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      224. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      225. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      226. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) ]
      227. <<<<<<< HEAD
      228. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      229. ======= =======
      230. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      231. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      232. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      233. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      234. =======
      235. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) =======
      236. =======
      237. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) =======
      238. >>>>>>> bd8bda4 (Manifest_cache true) =======
      239. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) =======
      240. >>>>>>> 183b6c5 (Manifest_cache true) =======
      241. >>>>>>> fd6db03 (Manifest_cache true) =======
      242. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      243. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      244. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      245. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) end
      246. <<<<<<< HEAD
      247. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      248. ======= =======
      249. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 1c3ace6 (Manifest_cache true)
      250. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD =======
      251. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      252. ======= >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= =======
      253. ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      254. ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= =======
      255. ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true)
      256. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      257. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true)
      258. >>>>>>> 02a399d (Manifest_cache true) =======
      259. >>>>>>> bd8bda4 (Manifest_cache true) =======
      260. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) =======
      261. >>>>>>> 183b6c5 (Manifest_cache true) =======
      262. >>>>>>> fd6db03 (Manifest_cache true) =======
      263. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      264. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      265. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      266. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
      267. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= =======
      268. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true)
      269. <<<<<<< HEAD
      270. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      271. ======= =======
      272. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true)
      273. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      274. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      275. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true)
      276. =======
      277. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) =======
      278. >>>>>>> bd8bda4 (Manifest_cache true) =======
      279. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) =======
      280. >>>>>>> 183b6c5 (Manifest_cache true) =======
      281. >>>>>>> fd6db03 (Manifest_cache true) =======
      282. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      283. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      284. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
      285. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) 1 <<<<<<< HEAD describe '#categories_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe '#categories_names' do ======= ======= describe '#categories_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) describe '#categories_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it '#authors_names' do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= describe '#categories_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) describe '#categories_names' do ======= it '#authors_names' do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) ======= context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= describe '#categories_names' do >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true)
      286. <<<<<<< HEAD
      287. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      288. 2 ======= =======
      289. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true)
      290. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      291. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      292. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true)
      293. 2 =======
      294. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) =======
      295. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
      296. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) =======
      297. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
      298. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
      299. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      300. 2 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
      301. 2 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) ======= it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true)
      302. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      303. ======= ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) =======
      304. ======= >>>>>>> c8da2e3 (Fix) =======
      305. ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      306. 1 <<<<<<< HEAD ======= =======
      307. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3be4d14 (Manifest_cache true) =======
      308. =======
      309. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= =======
      310. 1 >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true)
      311. <<<<<<< HEAD <<<<<<< HEAD
      312. ======= <<<<<<< HEAD
      313. =======
      314. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) =======
      315. >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) end >>>>>>> 7375d4b (Manifest_cache true)
      316. <<<<<<< HEAD
      317. <<<<<<< HEAD =======
      318. >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD =======
      319. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      320. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      321. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= =======
      322. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) >>>>>>> fd6db03 (Manifest_cache true) =======
      323. 1 >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= end >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 8a3779d4 (Manifest_cache true) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true)
      324. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true)
      325. 1 ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true)
      326. ======= <<<<<<< HEAD
      327. =======
      328. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) =======
      329. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) end >>>>>>> 7375d4b (Manifest_cache true)
      330. <<<<<<< HEAD
      331. <<<<<<< HEAD =======
      332. >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD =======
      333. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= =======
      334. >>>>>>> 7c4ea7f (Fix) end
      335. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      336. 1 it '#categories_names' do
      337. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      338. ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) end
      339. =======
      340. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD end ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix)
      341. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      342. ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 99dad91f (Fix)
      343. 1 =======
      344. =======
      345. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e18eb87 (Fix) it '#categories_names' do
      346. <<<<<<< HEAD
      347. =======
      348. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true)
      349. <<<<<<< HEAD
      350. <<<<<<< HEAD ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) end
      351. =======
      352. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      353. >>>>>>> bd8bda4 (Manifest_cache true) =======
      354. >>>>>>> aa7b40c (Manifest_cache true) =======
      355. >>>>>>> 183b6c5 (Manifest_cache true) =======
      356. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b47 (Fix) end ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 67ab5299 (Fix) ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= end >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix)
      357. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true)
      358. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      359. 1 ======= ======= >>>>>>> e18eb87 (Fix)
      360. =======
      361. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= =======
      362. >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD it '#categories_names' do ======= >>>>>>> e18eb87 (Fix)
      363. <<<<<<< HEAD
      364. ======= <<<<<<< HEAD
      365. >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      366. =======
      367. >>>>>>> 02a399d (Manifest_cache true) =======
      368. >>>>>>> fd6db03 (Manifest_cache true) =======
      369. >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD ======= describe '#authors_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix)
      370. <<<<<<< HEAD <<<<<<< HEAD
      371. end
      372. =======
      373. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      374. >>>>>>> bd8bda4 (Manifest_cache true) =======
      375. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true) end
      376. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true)
      377. =======
      378. >>>>>>> 02a399d (Manifest_cache true) =======
      379. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      380. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) =======
      381. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      382. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      383. <<<<<<< HEAD
      384. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix)
      385. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      386. =======
      387. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      388. >>>>>>> fd6db03 (Manifest_cache true) =======
      389. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      390. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
      391. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD
      392. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      393. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      394. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      395. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD describe '#authors_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d9d85ca6 (Fix) describe '#authors_names' do
      396. <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
      397. =======
      398. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
      399. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= describe '#authors_names' do ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) ======= it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> e59c273d (Manifest_cache true)
      400. <<<<<<< HEAD
      401. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      402. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD
      403. =======
      404. >>>>>>> 02a399d (Manifest_cache true) =======
      405. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD
      406. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      407. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) =======
      408. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      409. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      410. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) 1 <<<<<<< HEAD it { ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) it { <<<<<<< HEAD ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD it { >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= it { >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= it { >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      411. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      412. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
      413. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 67ab5299 (Fix)
      414. <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true)
      415. ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true)
      416. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      417. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) <<<<<<< HEAD end
      418. ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) ======= end >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      419. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 21793167 (Manifest_cache true)
      420. 1 =======
      421. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      422. <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true)
      423. 1 <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) <<<<<<< HEAD it '#categories_names' do ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= it '#categories_names' do >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price)
      424. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      425. ======= ======= >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price)
      426. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      427. end
      428. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
      429. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      430. >>>>>>> bd8bda4 (Manifest_cache true) =======
      431. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= =======
      432. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= =======
      433. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      434. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
      435. <<<<<<< HEAD
      436. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      437. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      438. =======
      439. >>>>>>> 02a399d (Manifest_cache true) =======
      440. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      441. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 9e081dc (Fix) ======= =======
      442. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) =======
      443. >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix)
      444. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 9e081dc (Fix)
      445. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      446. =======
      447. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4367ccb1 (Manifest_cache true) =======
      448. >>>>>>> fd6db03 (Manifest_cache true) =======
      449. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      450. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      451. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD
      452. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      453. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      454. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      455. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      456. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= <<<<<<< HEAD
      457. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= =======
      458. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= =======
      459. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======
      460. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) 1 <<<<<<< HEAD describe '#authors_names' do <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD <<<<<<< HEAD describe '#authors_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d59aaa (Fix) describe '#authors_names' do
      461. <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
      462. =======
      463. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
      464. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) ======= it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> c0159bf (Manifest_cache true)
      465. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) =======
      466. ======= <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      467. =======
      468. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
      469. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) =======
      470. >>>>>>> 6da9530 (Featire specs) ======= =======
      471. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD
      472. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= =======
      473. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= =======
      474. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= describe '#authors_names' do ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= it { >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 9e081dc (Fix) it { ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d59aaa (Fix) it { <<<<<<< HEAD ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD it { >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)
      475. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 99dad91f (Fix)
      476. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true)
      477. =======
      478. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= =======
      479. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD
      480. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      481. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) =======
      482. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      483. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      484. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= it { ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) it { <<<<<<< HEAD ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD it { >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= it { >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= it { >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
      485. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)
      486. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
      487. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true)
      488. ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true)
      489. ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true)
      490. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix)
      491. ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 7375d4b (Manifest_cache true)
      492. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 16ebb0ff (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 42e9c2e (Manifest_cache true) >>>>>>> 16ebb0ff (Manifest_cache true)
      493. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) end
      494. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= end >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
      495. <<<<<<< HEAD <<<<<<< HEAD =======
      496. 1 =======
      497. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price)
      498. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) =======
      499. 1 =======
      500. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      501. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true)
      502. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) it '#categories_names' do ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= it '#categories_names' do >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= it '#categories_names' do >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= it '#categories_names' do >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price)
      503. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price)
      504. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      505. end
      506. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= =======
      507. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      508. >>>>>>> bd8bda4 (Manifest_cache true) =======
      509. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a71befd (Manifest_cache true) ======= =======
      510. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= =======
      511. >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      512. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) end
      513. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix)
      514. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      515. =======
      516. >>>>>>> 02a399d (Manifest_cache true)
      517. <<<<<<< HEAD
      518. =======
      519. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true)
      520. <<<<<<< HEAD
      521. =======
      522. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true)
      523. <<<<<<< HEAD
      524. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
      525. ======= >>>>>>> 7375d4b (Manifest_cache true)
      526. ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true)
      527. 1 it '#categories_names' do
      528. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      529. end
      530. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      531. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      532. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) =======
      533. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
      534. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      535. =======
      536. >>>>>>> 02a399d (Manifest_cache true)
      537. <<<<<<< HEAD
      538. =======
      539. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true)
      540. <<<<<<< HEAD
      541. =======
      542. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true)
      543. <<<<<<< HEAD
      544. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
      545. ======= >>>>>>> 7375d4b (Manifest_cache true)
      546. ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true)
      547. 1 it '#categories_names' do
      548. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      549. end
      550. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      551. <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= =======
      552. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= =======
      553. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= =======
      554. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      555. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      556. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= =======
      557. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= =======
      558. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= =======
      559. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) "#{authors.last.first_name} #{authors.last.last_name}")
      560. }
      561. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 9e081dc (Fix)
      562. >>>>>>> 02a399d (Manifest_cache true) =======
      563. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      564. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      565. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      566. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= =======
      567. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= =======
      568. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) end
      569. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)
      570. 1 describe '#price' do
      571. 2 it { expect(decorated_object.price).to eq(1.23.to_money) }
      572. end
      573. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) =======
      574. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= =======
      575. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      576. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      577. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      578. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      579. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) =======
      580. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true)
      581. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
      582. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      583. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= =======
      584. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      585. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
      586. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) =======
      587. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= =======
      588. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      589. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      590. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      591. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      592. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      593. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
      594. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
      595. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      596. >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      597. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      598. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      599. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      600. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      601. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= =======
      602. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      603. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
      604. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
      605. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
      606. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      607. >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      608. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= =======
      609. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= =======
      610. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
      611. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= =======
      612. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= =======
      613. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      614. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true)

      spec/factories/addresses.rb

      100.0% lines covered

      2 relevant lines. 2 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :address do
      3. end
      4. end

      spec/factories/admin_users.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true)

      spec/factories/authors.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======

      spec/factories/authors.rb

      >>>>>>> 752f0c0 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true)

      spec/factories/authors.rb

      <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= =======

      spec/factories/authors.rb

      <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======

      spec/factories/authors.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> ebcdce06 (Featire specs)
      ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      >>>>>>> 9bfbd88 (Featire specs)

      spec/decorators/book_decorator_spec.rb

      100.0% lines covered

      15 relevant lines. 15 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BookDecorator do
      2. 4 subject(:decorated_object) { described_class.new(book) }
      3. 1 let(:book) do
      4. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
      5. categories_count: 0,
      6. authors_count: 0)
      7. end
      8. 1 let(:authors) do
      9. [
      10. 3 create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
      11. create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
      12. ]
      13. end
      14. 1 let(:categories) do
      15. [
      16. 3 create(:category, name: FFaker::Book.genre),
      17. create(:category, name: FFaker::Book.genre)
      18. ]
      19. end
      20. 1 describe '#categories_names' do
      21. 2 it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
      22. end
      23. 1 describe '#authors_names' do
      24. 1 it {
      25. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
      26. "#{authors.last.first_name} #{authors.last.last_name}")
      27. }
      28. end
      29. 1 describe '#price' do
      30. 2 it { expect(decorated_object.price).to eq(1.23.to_money) }
      31. end
      32. end

      spec/factories/addresses.rb

      100.0% lines covered

      2 relevant lines. 2 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :address do
      3. end
      4. end

      spec/factories/admin_users.rb

      >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true)

      spec/factories/authors.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======

      spec/factories/authors.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= =======

      spec/factories/authors.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

      100.0% lines covered

      4 relevant lines. 4 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) factory :admin_user do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= factory :admin_user do ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= factory :admin_user do ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) factory :admin_user do ======= factory :author do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= factory :author do >>>>>>> 752f0c0 (Featire specs) ======= factory :author do >>>>>>> 4e81ea2 (Featire specs) ======= factory :author do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= factory :admin_user do >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= factory :author do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= factory :author do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 0d6dd12 (Manifest_cache true) ======= factory :author do >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= factory :author do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= factory :admin_user do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= factory :author do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= factory :author do >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= factory :admin_user do >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= factory :admin_user do >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= factory :admin_user do >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= factory :author do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= factory :author do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 0d6dd12 (Manifest_cache true) ======= factory :author do >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= factory :author do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= factory :admin_user do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= factory :author do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= factory :admin_user do >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= factory :author do >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= factory :author do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= factory :author do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= factory :admin_user do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= factory :author do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= factory :admin_user do >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      4. 13 ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs)
      5. 15 >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      6. 13 =======
      7. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      8. 15 =======
      9. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
      10. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD
      11. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 448bef30 (Featire specs) =======
      12. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      13. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
      14. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
      15. 1 >>>>>>> 75fa7e1b (Rebased) =======
      16. 15 >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs)
      17. 15 ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) =======
      18. 15 ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs)
      19. 13 =======
      20. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      21. 15 =======
      22. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs)
      23. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      24. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      25. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      26. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
      27. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
      28. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= =======
      29. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs)
      30. 15 =======
      31. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
      32. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= =======
      33. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      34. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
      35. 15 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      36. 13 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
      37. 1 >>>>>>> 11792758 (Rebased) =======
      38. 15 >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= =======
      39. 1 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
      40. 15 >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      41. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      42. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) =======
      43. 15 >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD
      44. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= =======
      45. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      46. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= =======
      47. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= =======
      48. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= =======
      49. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD
      50. 15 =======
      51. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= =======
      52. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= =======
      53. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) =======
      54. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      55. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      56. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      57. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      58. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
      59. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= =======
      60. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      61. 15 =======
      62. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      63. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= =======
      64. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) email { FFaker::Internet.email } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= email { FFaker::Internet.email } ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= email { FFaker::Internet.email } ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) email { FFaker::Internet.email } ======= first_name { FFaker::Name.first_name } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 4e81ea2 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= email { FFaker::Internet.email } >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 0d6dd12 (Manifest_cache true) ======= first_name { FFaker::Name.first_name } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= email { FFaker::Internet.email } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= email { FFaker::Internet.email } >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= email { FFaker::Internet.email } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= email { FFaker::Internet.email } >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 0d6dd12 (Manifest_cache true) ======= first_name { FFaker::Name.first_name } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= email { FFaker::Internet.email } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= email { FFaker::Internet.email } >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= email { FFaker::Internet.email } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= email { FFaker::Internet.email } >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      65. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      66. 13 ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs)
      67. 15 >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs)
      68. 13 =======
      69. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      70. 1 >>>>>>> 752f0c0 (Featire specs) =======
      71. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      72. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
      73. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
      74. 1 >>>>>>> 75fa7e1b (Rebased) =======
      75. 15 >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      76. 15 ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      77. 15 ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      78. 13 =======
      79. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs)
      80. 15 =======
      81. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      82. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD
      83. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      84. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      85. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
      86. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
      87. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= =======
      88. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs)
      89. 15 =======
      90. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
      91. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= =======
      92. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      93. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
      94. 15 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      95. 13 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
      96. 1 >>>>>>> 11792758 (Rebased) =======
      97. 15 >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= =======
      98. 1 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
      99. 15 >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      100. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      101. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) =======
      102. 15 >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD
      103. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= =======
      104. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      105. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= =======
      106. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= =======
      107. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= =======
      108. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD
      109. 15 =======
      110. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= =======
      111. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= =======
      112. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) =======
      113. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      114. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      115. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      116. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      117. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
      118. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= =======
      119. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      120. 15 =======
      121. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      122. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= =======
      123. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) password { 'adminPassword' } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= password { 'adminPassword' } ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= password { 'adminPassword' } ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) password { 'adminPassword' } ======= last_name { FFaker::Name.last_name } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 4e81ea2 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= password { 'adminPassword' } >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 0d6dd12 (Manifest_cache true) ======= last_name { FFaker::Name.last_name } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= password { 'adminPassword' } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= password { 'adminPassword' } >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= password { 'adminPassword' } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= password { 'adminPassword' } >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 0d6dd12 (Manifest_cache true) ======= last_name { FFaker::Name.last_name } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= password { 'adminPassword' } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= password { 'adminPassword' } >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= password { 'adminPassword' } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= password { 'adminPassword' } >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      124. end
      125. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

      spec/factories/authors.rb

      80.0% lines covered

      10 relevant lines. 8 lines covered and 2 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :author do
      3. 5 first_name { FFaker::Name.first_name }
      4. 5 last_name { FFaker::Name.last_name }
      5. 1 transient do
      6. 1 books_count { 1 }
      7. end
      8. 1 after :create do |author, books_count|
      9. 10 author.books do
      10. Array.new(books_count) do
      11. association(:author, books: [instance])
      12. end
      13. end
      14. end
      15. end
      16. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

      spec/factories/authors_books.rb

      100.0% lines covered

      4 relevant lines. 4 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :authors_book do
      3. 1 author
      4. 1 book
      5. end
      6. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs)

      spec/factories/billings.rb

      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs)

      spec/factories/billings.rb

      =======

      spec/factories/books.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======

      spec/factories/books.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======

      spec/factories/billings.rb

      >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs)

      spec/factories/books.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======

      spec/factories/billings.rb

      >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======

      spec/factories/books.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) =======

      spec/factories/billings.rb

      >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======

      spec/factories/billings.rb

      >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

      spec/factories/billings.rb

      >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======

      spec/factories/billings.rb

      >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======

      spec/factories/books.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= =======

      spec/factories/billings.rb

      >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= =======

      spec/factories/books.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= =======

      spec/factories/billings.rb

      >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 8 relevant lines. 8 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) factory :billing do ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) factory :billing do
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
      4. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      5. 1 =======
      6. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      7. 3 ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs)
      8. 82 =======
      9. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      10. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) =======
      11. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      12. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      13. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      14. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      15. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      16. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      17. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      18. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      19. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      20. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) =======
      21. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      22. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= =======
      23. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      24. 1 =======
      25. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true)
      26. 82 =======
      27. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      28. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      29. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      30. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      31. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      32. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      33. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      34. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      35. 82 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= =======
      36. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      37. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= =======
      38. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      39. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= =======
      40. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) =======
      41. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= =======
      42. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= =======
      43. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      44. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= =======
      45. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      46. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======
      47. 82 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= =======
      48. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) user
      49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
      50. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      51. 1 =======
      52. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      53. 3 ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs)
      54. 92 =======
      55. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      56. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) =======
      57. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      58. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      59. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      60. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      61. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      62. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      63. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      64. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      65. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      66. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) =======
      67. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      68. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= =======
      69. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      70. 1 =======
      71. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true)
      72. 92 =======
      73. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      74. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      75. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      76. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      77. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      78. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      79. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      80. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      81. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= =======
      82. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      83. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= =======
      84. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      85. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= =======
      86. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) =======
      87. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= =======
      88. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= =======
      89. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      90. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= =======
      91. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      92. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======
      93. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= =======
      94. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) address { FFaker::AddressUA.street_address }
      95. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
      96. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      97. 1 =======
      98. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      99. 3 ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs)
      100. 82 =======
      101. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      102. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) =======
      103. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      104. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      105. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      106. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      107. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      108. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      109. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      110. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      111. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      112. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) =======
      113. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      114. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= =======
      115. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      116. 1 =======
      117. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true)
      118. 82 =======
      119. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      120. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      121. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      122. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      123. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      124. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      125. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      126. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      127. 82 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= =======
      128. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      129. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= =======
      130. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      131. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= =======
      132. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) =======
      133. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= =======
      134. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= =======
      135. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      136. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= =======
      137. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      138. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======
      139. 82 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= =======
      140. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) city { FFaker::AddressUA.city }
      141. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
      142. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      143. 1 =======
      144. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      145. 3 ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs)
      146. 92 =======
      147. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      148. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) =======
      149. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      150. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      151. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      152. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      153. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      154. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      155. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      156. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      157. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      158. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) =======
      159. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      160. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= =======
      161. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      162. 1 =======
      163. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true)
      164. 92 =======
      165. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      166. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      167. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      168. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      169. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      170. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      171. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      172. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      173. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= =======
      174. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      175. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= =======
      176. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      177. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= =======
      178. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) =======
      179. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= =======
      180. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= =======
      181. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      182. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= =======
      183. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      184. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======
      185. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= =======
      186. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) zip { FFaker::AddressUA.zip_code }
      187. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
      188. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      189. 1 =======
      190. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      191. 3 ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs)
      192. 92 =======
      193. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      194. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) =======
      195. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      196. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      197. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      198. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      199. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      200. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      201. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      202. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      203. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      204. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) =======
      205. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      206. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= =======
      207. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      208. 1 =======
      209. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true)
      210. 92 =======
      211. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      212. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      213. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      214. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      215. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      216. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      217. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      218. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      219. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= =======
      220. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      221. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= =======
      222. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      223. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= =======
      224. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) =======
      225. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= =======
      226. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= =======
      227. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      228. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= =======
      229. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      230. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======
      231. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= =======
      232. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) country { FFaker::AddressUA.country }
      233. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
      234. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      235. 1 =======
      236. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      237. 3 ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs)
      238. 92 =======
      239. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      240. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) =======
      241. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      242. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      243. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      244. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      245. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      246. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      247. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      248. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      249. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      250. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) =======
      251. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      252. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= =======
      253. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      254. 1 =======
      255. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true)
      256. 92 =======
      257. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      258. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      259. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      260. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      261. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      262. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      263. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      264. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      265. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= =======
      266. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      267. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= =======
      268. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      269. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= =======
      270. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) =======
      271. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= =======
      272. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= =======
      273. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      274. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= =======
      275. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      276. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======
      277. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= =======
      278. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) phone { FFaker::PhoneNumberUA.home_phone_number }
      279. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
      280. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      281. =======
      282. 3 ======= ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      283. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      284. =======
      285. 3 ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
      286. 92 =======
      287. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD ======= =======
      288. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> f92a45b (Featire specs)
      289. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      290. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      291. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      292. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      293. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      294. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      295. 90 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f92a45b (Featire specs)
      296. 3 >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs)
      297. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) =======
      298. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      299. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      300. =======
      301. 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true)
      302. 92 =======
      303. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      304. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      305. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      306. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      307. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      308. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      309. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      310. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      311. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= =======
      312. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      313. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= =======
      314. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) =======
      315. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= =======
      316. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= =======
      317. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      318. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= =======
      319. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      320. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======
      321. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> fb61c5a (Featire specs) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      322. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) =======
      323. >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= =======
      324. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
      325. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      326. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= =======
      327. >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) end
      328. end

      spec/factories/books.rb

      80.95% lines covered

      21 relevant lines. 17 lines covered and 4 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) factory :book do >>>>>>> c7a726c5 (Rebased)
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      4. 95 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      5. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      6. 1 =======
      7. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      8. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
      9. 82 =======
      10. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      11. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
      12. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      13. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      14. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      15. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      16. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      17. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      18. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
      19. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      20. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      21. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      22. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      23. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
      24. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      25. 1 =======
      26. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      27. 82 =======
      28. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      29. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      30. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      31. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      32. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      33. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      34. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      35. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      36. 82 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
      37. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      38. 95 >>>>>>> c7a726c5 (Rebased) =======
      39. 95 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      40. 3 ======= <<<<<<< HEAD
      41. 82 =======
      42. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      43. 80 >>>>>>> 752f0c0 (Featire specs) =======
      44. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      45. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      46. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      47. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      48. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      49. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      50. 95 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
      51. 95 =======
      52. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= =======
      53. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= =======
      54. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
      55. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
      56. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) =======
      57. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) =======
      58. 97 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs)
      59. 97 =======
      60. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      61. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      62. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      63. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      64. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      65. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      66. 105 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
      67. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
      68. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= =======
      69. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
      70. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
      71. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= =======
      72. 105 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) user
      73. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      74. 109 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      75. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      76. 1 =======
      77. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      78. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
      79. 92 =======
      80. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      81. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
      82. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      83. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      84. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      85. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      86. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      87. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      88. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
      89. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      90. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      91. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      92. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      93. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
      94. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      95. 1 =======
      96. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      97. 92 =======
      98. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      99. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      100. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      101. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      102. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      103. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      104. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      105. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      106. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
      107. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      108. 109 >>>>>>> c7a726c5 (Rebased) =======
      109. 109 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      110. 3 ======= <<<<<<< HEAD
      111. 92 =======
      112. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      113. 90 >>>>>>> 752f0c0 (Featire specs) =======
      114. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      115. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      116. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      117. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      118. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      119. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      120. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
      121. 109 =======
      122. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= =======
      123. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= =======
      124. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
      125. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
      126. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) =======
      127. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) =======
      128. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs)
      129. 111 =======
      130. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      131. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      132. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      133. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      134. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      135. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      136. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
      137. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
      138. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= =======
      139. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
      140. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
      141. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= =======
      142. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) address { FFaker::AddressUA.street_address }
      143. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      144. 92 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      145. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      146. 1 =======
      147. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      148. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
      149. 82 =======
      150. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      151. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
      152. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      153. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      154. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      155. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      156. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      157. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      158. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
      159. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      160. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      161. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      162. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      163. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
      164. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      165. 1 =======
      166. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      167. 82 =======
      168. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      169. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      170. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      171. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      172. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      173. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      174. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      175. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      176. 82 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
      177. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      178. 92 >>>>>>> c7a726c5 (Rebased) =======
      179. 92 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      180. 3 ======= <<<<<<< HEAD
      181. 82 =======
      182. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      183. 80 >>>>>>> 752f0c0 (Featire specs) =======
      184. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      185. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      186. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      187. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      188. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      189. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      190. 92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
      191. 92 =======
      192. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= =======
      193. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= =======
      194. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
      195. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
      196. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) =======
      197. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) =======
      198. 94 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs)
      199. 94 =======
      200. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      201. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      202. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      203. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      204. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      205. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      206. 98 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
      207. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
      208. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= =======
      209. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
      210. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
      211. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= =======
      212. 98 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD city { FFaker::AddressUA.city } ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= price { FFaker::Number.rand(100) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 0d6dd12 (Manifest_cache true) ======= price { FFaker::Number.rand(100) } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      213. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      214. 109 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      215. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      216. 1 =======
      217. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      218. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
      219. 92 =======
      220. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      221. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
      222. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      223. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      224. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      225. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      226. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      227. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      228. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
      229. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      230. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      231. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      232. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      233. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
      234. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      235. 1 =======
      236. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      237. 92 =======
      238. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      239. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      240. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      241. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      242. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      243. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      244. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      245. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      246. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
      247. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      248. 109 >>>>>>> c7a726c5 (Rebased) =======
      249. 109 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      250. 3 ======= <<<<<<< HEAD
      251. 92 =======
      252. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      253. 90 >>>>>>> 752f0c0 (Featire specs) =======
      254. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      255. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      256. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      257. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      258. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      259. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      260. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
      261. 109 =======
      262. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= =======
      263. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= =======
      264. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
      265. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
      266. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) =======
      267. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) =======
      268. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs)
      269. 111 =======
      270. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      271. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      272. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      273. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      274. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      275. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      276. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
      277. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
      278. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= =======
      279. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
      280. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
      281. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= =======
      282. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) zip { FFaker::AddressUA.zip_code }
      283. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      284. 109 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      285. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      286. 1 =======
      287. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      288. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
      289. 92 =======
      290. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      291. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
      292. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      293. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      294. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      295. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      296. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      297. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      298. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
      299. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      300. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      301. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      302. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      303. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
      304. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      305. 1 =======
      306. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      307. 92 =======
      308. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      309. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      310. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      311. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      312. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      313. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      314. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      315. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      316. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
      317. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      318. 109 >>>>>>> c7a726c5 (Rebased) =======
      319. 109 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      320. 3 ======= <<<<<<< HEAD
      321. 92 =======
      322. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      323. 90 >>>>>>> 752f0c0 (Featire specs) =======
      324. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      325. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      326. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      327. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      328. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      329. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      330. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
      331. 109 =======
      332. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= =======
      333. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= =======
      334. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
      335. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
      336. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) =======
      337. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) =======
      338. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs)
      339. 111 =======
      340. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      341. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      342. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      343. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      344. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      345. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      346. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
      347. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
      348. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= =======
      349. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
      350. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
      351. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= =======
      352. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) country { FFaker::AddressUA.country }
      353. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      354. 109 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      355. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      356. 1 =======
      357. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      358. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
      359. 92 =======
      360. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      361. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
      362. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      363. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      364. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      365. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      366. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      367. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      368. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
      369. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      370. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      371. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      372. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      373. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
      374. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      375. 1 =======
      376. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      377. 92 =======
      378. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      379. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      380. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      381. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      382. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      383. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      384. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      385. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      386. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
      387. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      388. 109 >>>>>>> c7a726c5 (Rebased) =======
      389. 109 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      390. 3 ======= <<<<<<< HEAD
      391. 92 =======
      392. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      393. 90 >>>>>>> 752f0c0 (Featire specs) =======
      394. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      395. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      396. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      397. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      398. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      399. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      400. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
      401. 109 =======
      402. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= =======
      403. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= =======
      404. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= =======
      405. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e18eb87 (Fix) ======= =======
      406. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) =======
      407. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) =======
      408. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs)
      409. 111 =======
      410. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      411. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      412. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      413. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      414. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      415. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      416. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
      417. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
      418. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= =======
      419. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
      420. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
      421. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= =======
      422. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) phone { FFaker::PhoneNumberUA.home_phone_number }
      423. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      424. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      425. =======
      426. 3 ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      427. 3 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      428. =======
      429. 3 ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true)
      430. 92 =======
      431. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      432. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      433. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      434. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      435. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      436. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      437. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      438. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true)
      439. 90 >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true)
      440. 3 >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD
      441. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      442. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      443. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true)
      444. =======
      445. 3 <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      446. 92 =======
      447. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      448. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      449. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      450. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      451. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      452. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      453. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      454. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      455. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) =======
      456. 109 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      457. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      458. 3 ======= <<<<<<< HEAD
      459. 92 =======
      460. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      461. 90 >>>>>>> 752f0c0 (Featire specs) =======
      462. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      463. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      464. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      465. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= =======
      466. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      467. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      468. 109 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
      469. 109 =======
      470. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
      471. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= =======
      472. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      473. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
      474. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) =======
      475. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) =======
      476. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs)
      477. 111 =======
      478. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      479. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      480. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      481. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      482. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      483. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      484. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= =======
      485. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= =======
      486. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= =======
      487. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= =======
      488. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= =======
      489. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= =======
      490. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 610b6138 (Featire specs) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= >>>>>>> ebcdce06 (Featire specs) quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84003439 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) quantity { FFaker::Number.rand(2..10) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      491. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true) =======
      492. >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      493. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
      494. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      495. 1 transient do
      496. 1 categories_count { 1 }
      497. end
      498. 1 transient do
      499. 1 authors_count { 1 }
      500. end
      501. 1 after :create do |book, authors_count|
      502. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      503. 110 ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 9e081dc (Fix)
      504. 108 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
      505. 108 =======
      506. 108 >>>>>>> e18eb87 (Fix) =======
      507. 110 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) =======
      508. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) =======
      509. 110 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) =======
      510. 110 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      511. 110 >>>>>>> e3e66f3 (Featire specs) =======
      512. 118 >>>>>>> 5b7749a (Fix) =======
      513. 108 >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= =======
      514. 118 >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) book.authors do
      515. Array.new(authors_count) do
      516. association(:book, authors: [instance])
      517. end
      518. end
      519. end
      520. 1 after :create do |book, categories_count|
      521. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      522. 110 ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 9e081dc (Fix)
      523. 108 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
      524. 108 =======
      525. 108 >>>>>>> e18eb87 (Fix) =======
      526. 110 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) =======
      527. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) =======
      528. 110 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) =======
      529. 110 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      530. 110 >>>>>>> e3e66f3 (Featire specs) =======
      531. 118 >>>>>>> 5b7749a (Fix) =======
      532. 108 >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= =======
      533. 118 >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) book.categories do
      534. Array.new(categories_count) do
      535. association(:book, categories: [instance])
      536. end
      537. end
      538. end
      539. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) end
      540. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      541. =======
      542. >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
      543. ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs)
      544. =======
      545. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
      546. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      547. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      548. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= =======
      549. >>>>>>> 0d6dd12 (Manifest_cache true) =======
      550. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      551. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      552. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
      553. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      554. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= =======
      555. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= =======
      556. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      557. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= =======
      558. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      559. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) =======
      560. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      561. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      562. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

      spec/factories/books.rb

      80.95% lines covered

      21 relevant lines. 17 lines covered and 4 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) factory :book do
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      4. 95 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      5. 3 ======= <<<<<<< HEAD
      6. 82 =======
      7. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      8. 80 >>>>>>> 752f0c0 (Featire specs) =======
      9. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      10. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      11. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      12. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      13. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      14. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      15. 95 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      16. 95 =======
      17. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      18. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      19. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      20. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      21. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      22. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      23. 97 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      24. 97 =======
      25. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      26. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      27. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      28. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      29. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      30. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      31. 105 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) title { FFaker::Book.title }
      32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      33. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      34. 3 ======= <<<<<<< HEAD
      35. 92 =======
      36. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      37. 90 >>>>>>> 752f0c0 (Featire specs) =======
      38. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      39. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      40. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      41. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      42. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      43. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      44. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      45. 109 =======
      46. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      47. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      48. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      49. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      50. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      51. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      52. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      53. 111 =======
      54. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      55. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      56. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      57. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      58. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      59. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      60. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) description { FFaker::Book.description }
      61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      62. 92 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      63. 3 ======= <<<<<<< HEAD
      64. 82 =======
      65. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      66. 80 >>>>>>> 752f0c0 (Featire specs) =======
      67. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      68. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      69. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      70. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      71. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      72. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      73. 92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      74. 92 =======
      75. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      76. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      77. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      78. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      79. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      80. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      81. 94 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      82. 94 =======
      83. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      84. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      85. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      86. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      87. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      88. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      89. 98 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price_cents { FFaker::Number.rand(10_000) } ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= price { FFaker::Number.rand(100) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 0d6dd12 (Manifest_cache true) ======= price { FFaker::Number.rand(100) } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      90. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      91. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      92. 3 ======= <<<<<<< HEAD
      93. 92 =======
      94. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      95. 90 >>>>>>> 752f0c0 (Featire specs) =======
      96. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      97. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      98. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      99. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      100. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      101. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      102. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      103. 109 =======
      104. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      105. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      106. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      107. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      108. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      109. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      110. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      111. 111 =======
      112. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      113. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      114. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      115. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      116. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      117. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      118. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) materials { FFaker::Book.cover(:format) }
      119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      120. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      121. 3 ======= <<<<<<< HEAD
      122. 92 =======
      123. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      124. 90 >>>>>>> 752f0c0 (Featire specs) =======
      125. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      126. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      127. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      128. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      129. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      130. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      131. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      132. 109 =======
      133. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      134. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      135. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      136. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      137. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      138. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      139. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      140. 111 =======
      141. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      142. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      143. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      144. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      145. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      146. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      147. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) year_of_publication { FFaker::Number.rand(1900..2022) }
      148. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      149. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      150. 3 ======= <<<<<<< HEAD
      151. 92 =======
      152. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      153. 90 >>>>>>> 752f0c0 (Featire specs) =======
      154. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      155. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      156. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      157. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      158. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      159. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      160. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      161. 109 =======
      162. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      163. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      164. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      165. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      166. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      167. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      168. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      169. 111 =======
      170. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      171. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      172. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      173. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      174. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      175. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      176. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) dimensions { FFaker::Book.cover(:size) }
      177. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      178. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      179. 3 ======= <<<<<<< HEAD
      180. 92 =======
      181. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      182. 90 >>>>>>> 752f0c0 (Featire specs) =======
      183. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      184. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      185. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      186. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= =======
      187. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      188. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      189. 109 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      190. 109 =======
      191. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
      192. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      193. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      194. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
      195. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      196. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      197. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      198. 111 =======
      199. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      200. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      201. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      202. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      203. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      204. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      205. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6e923b9d (Featire specs) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      206. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      207. 1 transient do
      208. 1 categories_count { 1 }
      209. end
      210. 1 transient do
      211. 1 authors_count { 1 }
      212. end
      213. 1 after :create do |book, authors_count|
      214. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      215. 110 =======
      216. 108 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
      217. 108 =======
      218. 110 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
      219. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
      220. 110 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
      221. 110 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      222. 110 >>>>>>> e3e66f3 (Featire specs) =======
      223. 118 >>>>>>> 5b7749a (Fix) book.authors do
      224. Array.new(authors_count) do
      225. association(:book, authors: [instance])
      226. end
      227. end
      228. end
      229. 1 after :create do |book, categories_count|
      230. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      231. 110 =======
      232. 108 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
      233. 108 =======
      234. 110 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
      235. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
      236. 110 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
      237. 110 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      238. 110 >>>>>>> e3e66f3 (Featire specs) =======
      239. 118 >>>>>>> 5b7749a (Fix) book.categories do
      240. Array.new(categories_count) do
      241. association(:book, categories: [instance])
      242. end
      243. end
      244. end
      245. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      246. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      247. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      248. ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs)
      249. =======
      250. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      251. >>>>>>> 752f0c0 (Featire specs) =======
      252. >>>>>>> 4e81ea2 (Featire specs) =======
      253. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      254. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
      255. >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
      256. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      257. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      258. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= =======
      259. >>>>>>> 0d6dd12 (Manifest_cache true) =======
      260. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      261. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      262. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
      263. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
      264. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= =======
      265. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
      266. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      267. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
      268. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      269. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD
      270. >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 0676508 (Featire specs) =======
      271. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= =======
      272. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      273. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= =======
      274. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= =======
      275. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= =======
      276. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= =======
      277. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= =======
      278. >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= =======
      279. >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= =======
      280. >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= =======
      281. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      282. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= =======
      283. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= =======
      284. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs)

      spec/factories/books_categories.rb

      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs)

      spec/factories/books_categories.rb

      =======

      spec/factories/books_category.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======

      spec/factories/books_category.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======

      spec/factories/books_categories.rb

      >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs)

      spec/factories/books_category.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======

      spec/factories/books_categories.rb

      >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======

      spec/factories/books_category.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) =======

      spec/factories/books_categories.rb

      >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======

      spec/factories/books_categories.rb

      >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

      spec/factories/books_categories.rb

      >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======

      spec/factories/books_categories.rb

      >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======

      spec/factories/books_category.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= =======

      spec/factories/books_categories.rb

      >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= =======

      spec/factories/books_category.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= =======

      spec/factories/books_categories.rb

      >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

      100.0% lines covered

      4 relevant lines. 4 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :books_category do
      3. 1 book
      4. 1 category
      5. end
      6. end

      spec/factories/categories.rb

      100.0% lines covered

      3 relevant lines. 3 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :category do
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      4. 12 ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 251144b4 (Manifest_cache true) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      5. 12 >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
      6. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
      7. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
      8. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
      9. 12 ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true)
      10. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
      11. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
      12. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
      13. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      14. 1 ======= <<<<<<< HEAD
      15. 8 =======
      16. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      17. 8 >>>>>>> 752f0c0 (Featire specs) =======
      18. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
      19. 8 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) =======
      20. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs)
      21. 8 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      22. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
      23. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs)
      24. 8 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      25. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      26. 8 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      27. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      28. 12 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs)
      29. 12 >>>>>>> 9620751 (Featire specs) ======= =======
      30. 12 >>>>>>> 6da9530 (Featire specs) =======
      31. 12 >>>>>>> 9620751 (Featire specs) =======
      32. 12 >>>>>>> 2a25e4c (Featire specs) =======
      33. 8 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) =======
      34. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true)
      35. 8 =======
      36. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      37. 8 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      38. 1 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      39. 8 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      40. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      41. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
      42. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      43. 12 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      44. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      45. 8 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      46. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      47. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      48. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      49. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      50. 8 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      51. 1 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      52. 8 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      53. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      54. 12 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      55. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      56. 8 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      57. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      58. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      59. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      60. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      61. 8 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      62. 1 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      63. 8 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      64. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
      65. 8 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      66. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
      67. 8 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      68. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      69. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
      70. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
      71. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
      72. 8 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
      73. 1 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= =======
      74. 8 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      75. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= =======
      76. 8 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= =======
      77. 1 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
      78. 8 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) name { FFaker::Book.genre }
      79. end
      80. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) =======
      ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs)

      spec/factories/reviews.rb

      ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) =======
      ======= ======= >>>>>>> bae2b7de (Add login registration pages)

      spec/factories/users.rb

      ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased) >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
      ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages)

      spec/factories/users.rb

      =======

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages)
      >>>>>>> 715fac2 (Featire specs)
      <<<<<<< HEAD

      spec/factories/reviews.rb

      >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) =======

      spec/factories/users.rb

      <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 659083f (Featire specs) =======

      spec/factories/users.rb

      ======= <<<<<<< HEAD =======

      spec/factories/users.rb

      ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD

      spec/factories/reviews.rb

      <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
      =======
      >>>>>>> 7c4ea7f (Fix)
      <<<<<<< HEAD

      spec/factories/reviews.rb

      <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      =======

      spec/factories/coupons.rb

      >>>>>>> 1d59aaa (Fix)

      100.0% lines covered

      6 relevant lines. 6 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :coupon do
      3. 4 code { SecureRandom.hex }
      4. 4 is_active { true }
      5. 4 active_till_date { FFaker::Time.datetime }
      6. 1 discount { rand(0..50) / 100 }
      7. end
      8. end

      spec/factories/order_books.rb

      =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 4552227 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> e1f4d17 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> 730a8ca (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> 1214e1f (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 1d59aaa (Fix) 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :user do
      3. end
      4. end
      >>>>>>> e1f4d17 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs)

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs)
      2. <<<<<<< HEAD <<<<<<< HEAD
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD factory :user do
      6. end
      7. end
      >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs)

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
      =======
      >>>>>>> 7c4ea7f (Fix)
      <<<<<<< HEAD

      spec/factories/reviews.rb

      ======= ======= >>>>>>> 7375d4b (Manifest_cache true) =======

      spec/factories/users.rb

      <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/factories/users.rb

      <<<<<<< HEAD ======= ======= =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      =======

      spec/factories/coupons.rb

      >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 6 relevant lines. 6 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :coupon do
      3. 4 code { SecureRandom.hex }
      4. 4 is_active { true }
      5. 4 active_till_date { FFaker::Time.datetime }
      6. 1 discount { rand(0..50) / 100 }
      7. end
      8. end

      spec/factories/order_books.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 4552227 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) FactoryBot.define do <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.define do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased)
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> e1f4d17 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> 730a8ca (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs)
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
      6. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) =======
      7. >>>>>>> 4e81ea2 (Featire specs) =======
      8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= =======
      11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
      12. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :user do
      13. end
      14. end
      >>>>>>> e1f4d17 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e5752db (Featire specs)

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs)
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD =======
      5. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :user do
      6. end
      7. end
      >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs)

      spec/feature/book_spec.rb

      <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) 5 relevant lines. 5 lines covered and ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) FactoryBot.define do ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.define do >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= FactoryBot.define do >>>>>>> 5b7749a (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
      3. 1 ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      4. 1 =======
      5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      7. >>>>>>> 4e81ea2 (Featire specs) =======
      8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) =======
      9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
      11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
      12. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      15. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD factory :user do
      16. end
      17. end
      >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 08edf50 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 08edf50 (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) =======
      6. >>>>>>> 4e81ea2 (Featire specs) =======
      7. >>>>>>> 08edf50 (Featire specs) =======
      8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD factory :review do ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= factory :review do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= factory :order_book do >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= factory :review do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= factory :order_book do >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      9. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) title { FFaker::Lorem.words(5) } ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= order >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= title { FFaker::Lorem.words(5) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= order >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)
      11. 1 ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
      12. 1 =======
      13. 5 >>>>>>> d0dc1f1 (Featire specs) =======
      14. 5 >>>>>>> 752f0c0 (Featire specs) =======
      15. 5 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8181d13 (Featire specs) =======
      16. 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) =======
      17. 5 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 72b9cab (Featire specs) =======
      18. 5 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) =======
      19. 5 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15c51b7 (Featire specs) =======
      20. 5 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) =======
      21. 5 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      22. 1 >>>>>>> 5b7749a (Fix) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d59aaa (Fix)
      23. 1 >>>>>>> 9e081dc (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) rating { FFaker::Number.rand(0..5) } ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9e081dc (Fix) book
      24. 5 quantity { 1 }
      25. end
      26. end

      spec/factories/orders.rb

      77.78% lines covered

      9 relevant lines. 7 lines covered and 2 lines missed.
          
      1. 1 <<<<<<< HEAD ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs)
      2. 1 =======
      3. 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= =======
      4. 5 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix) FactoryBot.define do
      5. 1 factory :order do
      6. 5 status { 'created' }
      7. <<<<<<< HEAD ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4552227 (Featire specs) >>>>>>> 15c51b7 (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) =======
      8. 1 transient do
      9. 1 books_count { 1 }
      10. end
      11. 1 after :create do |order, books_count|
      12. 4 order.books do
      13. Array.new(books_count) do
      14. association(:order, books: [instance])
      15. end
      16. end
      17. end
      18. end
      19. end
      ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs)

      spec/factories/reviews.rb

      =======

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs)
      2. <<<<<<< HEAD <<<<<<< HEAD
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs)
      6. 1 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs)
      7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
      8. 1 rating { FFaker::Number.rand(0..5) } >>>>>>> 9e081dc (Fix)
      9. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD transient do
      10. 1 books_count { 1 }
      11. end
      12. 1 after :create do |order, books_count|
      13. 4 order.books do
      14. Array.new(books_count) do
      15. association(:order, books: [instance])
      16. end
      17. end
      18. end
      19. end
      20. end

      spec/factories/reviews.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :review do
      3. 1 title { FFaker::Lorem.words(5) }
      4. ======= >>>>>>> 6da9530 (Featire specs)
      5. 1 rating { FFaker::Number.rand(0..5) } <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      7. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      8. 1 =======
      9. 3 >>>>>>> d0dc1f1 (Featire specs) =======
      10. 3 >>>>>>> 752f0c0 (Featire specs) =======
      11. 3 >>>>>>> 4e81ea2 (Featire specs) =======
      12. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      13. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
      14. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======
      15. 3 >>>>>>> 7a02bbe (Featire specs) =======
      16. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
      17. 3 >>>>>>> 4552227 (Featire specs) =======
      18. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) =======
      19. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) body { FFaker::Lorem.words(500) }
      20. end
      21. end

      spec/factories/shippings.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :shipping do
      3. 1 user
      4. 1 address { FFaker::AddressUA.street_address }
      5. 1 city { FFaker::AddressUA.city }
      6. 1 zip { FFaker::AddressUA.zip_code }
      7. 1 country { FFaker::AddressUA.country }
      8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
      9. end
      10. end
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)

      spec/factories/users.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :user do
      3. 17 email { FFaker::Internet.email }
      4. 24 password { 'password' }
      5. 24 confirmed_at { Time.zone.now }
      6. end
      7. end
      <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      >>>>>>> 9bfbd88 (Featire specs)

      spec/factories/reviews.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :review do
      3. 1 title { FFaker::Lorem.words(5) }
      4. 1 rating { FFaker::Number.rand(0..5) }
      5. 1 body { FFaker::Lorem.words(500) }
      6. end
      7. end

      spec/factories/shippings.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :shipping do
      3. 1 user
      4. 1 address { FFaker::AddressUA.street_address }
      5. 1 city { FFaker::AddressUA.city }
      6. 1 zip { FFaker::AddressUA.zip_code }
      7. 1 country { FFaker::AddressUA.country }
      8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
      9. end
      10. end
      >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased)

      spec/factories/users.rb

      <<<<<<< HEAD ======= ======= =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD

      spec/factories/reviews.rb

      <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages)

      spec/factories/reviews.rb

      ======= <<<<<<< HEAD =======

      spec/factories/users.rb

      ======= <<<<<<< HEAD ======= =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD

      spec/factories/reviews.rb

      <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
      =======
      >>>>>>> 7c4ea7f (Fix)
      <<<<<<< HEAD

      spec/factories/reviews.rb

      ======= ======= >>>>>>> 7375d4b (Manifest_cache true) =======

      spec/factories/users.rb

      <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/factories/users.rb

      <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      <<<<<<< HEAD =======

      spec/factories/coupons.rb

      >>>>>>> 5b7749a (Fix) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased)

      spec/factories/reviews.rb

      >>>>>>> 11792758 (Rebased)

      100.0% lines covered

      <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 6 relevant lines. 6 lines covered and ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
      2. 1 factory :coupon do
      3. 4 code { SecureRandom.hex }
      4. 4 is_active { true }
      5. 4 active_till_date { FFaker::Time.datetime }
      6. 1 discount { rand(0..50) / 100 }
      7. end
      8. end

      spec/factories/order_books.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 4552227 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> e1f4d17 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> 730a8ca (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 11792758 (Rebased) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) =======
      6. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :user do
      7. end
      8. end
      >>>>>>> e1f4d17 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) FactoryBot.define do
      2. 1 <<<<<<< HEAD factory :user do
      3. end
      4. end
      <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e5752db (Featire specs)

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= =======
      6. >>>>>>> 4e81ea2 (Featire specs) =======
      7. >>>>>>> 08edf50 (Featire specs) =======
      8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      9. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= =======
      10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= factory :review do >>>>>>> 11792758 (Rebased)
      11. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= title { FFaker::Lorem.words(5) } >>>>>>> 11792758 (Rebased)
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased)
      13. 1 rating { FFaker::Number.rand(0..5) }
      14. 1 body { FFaker::Lorem.words(500) }
      15. end
      16. end

      spec/factories/shippings.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :shipping do
      3. 1 user
      4. 1 address { FFaker::AddressUA.street_address }
      5. 1 city { FFaker::AddressUA.city }
      6. 1 zip { FFaker::AddressUA.zip_code }
      7. 1 country { FFaker::AddressUA.country }
      8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
      9. end
      10. end
      >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased)

      spec/factories/users.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) factory :user do
      3. <<<<<<< HEAD <<<<<<< HEAD
      4. =======
      5. 1 =======
      6. 13 >>>>>>> 31d15e66 (Fix) email { FFaker::Internet.email }
      7. 20 password { 'password' }
      8. 20 confirmed_at { Time.zone.now }
      9. >>>>>>> 11792758 (Rebased) end
      10. <<<<<<< HEAD
      11. =======
      12. >>>>>>> 11792758 (Rebased) end
      <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs)

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> fc3774fd (Featire specs) 5 relevant lines. 5 lines covered and ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) FactoryBot.define do ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.define do >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= FactoryBot.define do >>>>>>> 5b7749a (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
      3. 1 ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      4. 1 =======
      5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      7. >>>>>>> 4e81ea2 (Featire specs) =======
      8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) =======
      9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
      11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
      12. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      15. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD factory :user do
      16. end
      17. end
      >>>>>>> e1f4d17 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> 730a8ca (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)

      spec/factories/reviews.rb

      ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      >>>>>>> c033601 (Rebased)

      spec/feature/admin/author_spec.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) =======

      =======

      spec/feature/admin/author_spec.rb

      >>>>>>> e3e66f3 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> 9a49b7b (Rebased) ======= 31 relevant lines. 31 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= RSpec.describe 'Author' do >>>>>>> 9a49b7b (Rebased) ======= RSpec.describe 'Author' do >>>>>>> e3e66f3 (Featire specs)
      2. 1 <<<<<<< HEAD <<<<<<< HEAD factory :review do ======= include_context 'with api request authentication helper methods' >>>>>>> 9a49b7b (Rebased) ======= include_context 'with api request authentication helper methods' >>>>>>> e3e66f3 (Featire specs)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= include_context 'with api request global before and after hooks' >>>>>>> 9a49b7b (Rebased) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= title { FFaker::Lorem.words(5) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs)
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      5. 1 =======
      6. 5 >>>>>>> d0dc1f1 (Featire specs) =======
      7. 5 >>>>>>> 752f0c0 (Featire specs) =======
      8. 5 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs)
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      10. 1 =======
      11. 3 >>>>>>> d0dc1f1 (Featire specs) =======
      12. 3 >>>>>>> 752f0c0 (Featire specs) =======
      13. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) body { FFaker::Lorem.words(500) }
      14. end
      15. end

      spec/factories/shippings.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :shipping do
      3. 1 user
      4. 1 address { FFaker::AddressUA.street_address }
      5. 1 city { FFaker::AddressUA.city }
      6. 1 zip { FFaker::AddressUA.zip_code }
      7. 1 country { FFaker::AddressUA.country }
      8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
      9. end
      10. end
      >>>>>>> aca90e3 (Rebased)

      spec/factories/users.rb

      >>>>>>> 11792758 (Rebased)

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :user do
      3. 17 email { FFaker::Internet.email }
      4. 24 password { 'password' }
      5. 24 confirmed_at { Time.zone.now }
      6. end
      7. end
      <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 1214e1f (Add login registration pages)
      =======
      >>>>>>> aca90e3 (Rebased)
      <<<<<<< HEAD

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 08edf50 (Featire specs) =======

      spec/feature/admin/author_spec.rb

      <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true)

      =======

      spec/feature/admin/author_spec.rb

      <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs)

      =======

      spec/feature/admin/author_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
          
      1. 1 <<<<<<< HEAD FactoryBot.define do <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1b (Rebased) ======= RSpec.describe 'Author' do >>>>>>> c7a726c5 (Rebased)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) =======
      6. >>>>>>> 4e81ea2 (Featire specs) =======
      7. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      9. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      11. 1 >>>>>>> 75fa7e1b (Rebased) =======
      12. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= factory :review do >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) <<<<<<< HEAD factory :review do ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= factory :review do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= factory :order_book do >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= include_context 'with api request authentication helper methods' >>>>>>> c7a726c5 (Rebased)
      13. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= title { FFaker::Lorem.words(5) } >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) title { FFaker::Lorem.words(5) } ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= order >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= include_context 'with api request global before and after hooks' >>>>>>> c7a726c5 (Rebased)
      14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs)
      15. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      16. 1 =======
      17. ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true)
      18. 2 let(:first_name) { FFaker::Name.first_name }
      19. 2 let(:last_name) { FFaker::Name.last_name }
      20. 2 let(:new_name) { FFaker::Name.first_name }
      21. 2 let(:old_name) { author.first_name }
      22. 4 let(:author) { create(:author) }
      23. 1 before do
      24. 4 sign_in(create(:admin_user), :admin_user)
      25. end
      26. 1 it 'can create an author' do
      27. 1 visit 'admin/authors'
      28. 1 click_link('New Author')
      29. 1 fill_in 'author[first_name]', with: first_name
      30. 1 fill_in 'author[last_name]', with: last_name
      31. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      32. end
      33. 1 it 'can delete an author' do
      34. 1 author
      35. 1 visit 'admin/authors'
      36. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      37. end
      38. 1 it 'can view an author' do
      39. 1 author
      40. 1 visit 'admin/authors'
      41. 1 click_link('View')
      42. 1 expect(page).to have_content(author.first_name)
      43. end
      44. 1 it 'can edit an author' do
      45. 1 author
      46. 1 visit 'admin/authors'
      47. 1 click_link('Edit')
      48. 1 fill_in 'author[first_name]', with: new_name
      49. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      50. end
      51. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 7 let(:book) { create(:book) } <<<<<<< HEAD ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= include_context 'with api request global before and after hooks'
      5. 2 let(:first_name) { FFaker::Name.first_name }
      6. 2 let(:last_name) { FFaker::Name.last_name }
      7. 2 let(:new_name) { FFaker::Name.first_name }
      8. 2 let(:old_name) { author.first_name }
      9. 4 let(:author) { create(:author) }
      10. 1 before do
      11. 4 sign_in(create(:admin_user), :admin_user)
      12. end
      13. 1 it 'can create an author' do
      14. 1 visit 'admin/authors'
      15. 1 click_link('New Author')
      16. 1 fill_in 'author[first_name]', with: first_name
      17. 1 fill_in 'author[last_name]', with: last_name
      18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      19. end
      20. 1 it 'can delete an author' do
      21. 1 author
      22. 1 visit 'admin/authors'
      23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      24. end
      25. 1 it 'can view an author' do
      26. 1 author
      27. 1 visit 'admin/authors'
      28. 1 click_link('View')
      29. 1 expect(page).to have_content(author.first_name)
      30. end
      31. 1 it 'can edit an author' do
      32. 1 author
      33. 1 visit 'admin/authors'
      34. 1 click_link('Edit')
      35. 1 fill_in 'author[first_name]', with: new_name
      36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      37. end
      38. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 7 let(:book) { create(:book) } <<<<<<< HEAD ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      5. 1 let(:params) do
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      7. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      8. 1 =======
      9. 4 >>>>>>> d0dc1f1 (Featire specs) =======
      10. 4 >>>>>>> 752f0c0 (Featire specs) =======
      11. 4 >>>>>>> 4e81ea2 (Featire specs) =======
      12. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      13. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      14. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      15. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      16. 4 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      17. 4 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      18. 1 >>>>>>> 5b7749a (Fix) { title: FFaker::Book.title,
      19. description: FFaker::Book.description,
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= price_cents: FFaker::Number.rand(1..100), >>>>>>> 5b7749a (Fix)
      21. dimensions: FFaker::Book.cover,
      22. year_of_publication: FFaker::Number.rand(1900..2022),
      23. materials: 'Soft cover',
      24. quantity: FFaker::Number.rand(2..5) }
      25. end
      26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      27. 1 before do
      28. 6 sign_in(create(:admin_user), :admin_user)
      29. 6 book
      30. 6 visit 'admin/books'
      31. end
      32. 1 it 'can create an book' do
      33. 1 click_link('New Book')
      34. 1 fill_in 'book[title]', with: params[:title]
      35. 1 fill_in 'book[description]', with: params[:description]
      36. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
      37. 1 fill_in 'book[price_cents]', with: params[:price_cents]
      38. 1 fill_in 'book[materials]', with: params[:materials]
      39. 1 fill_in 'book[dimensions]', with: params[:dimensions]
      40. 1 fill_in 'book[quantity]', with: params[:quantity]
      41. 1 click_button('Create Book')
      42. 1 expect(page).to have_content(params[:title])
      43. end
      44. 1 it 'can delete an book' do
      45. 1 click_link('Delete')
      46. 1 expect(page).not_to have_content(book.title)
      47. end
      48. 1 it 'can view an book' do
      49. 1 click_link('View')
      50. 1 expect(page).to have_content(book.title)
      51. end
      52. 1 it 'can edit an book' do
      53. 1 click_link('Edit')
      54. 1 fill_in 'book[title]', with: 'New title'
      55. 1 click_button('Update Book')
      56. 1 expect(page).to have_content('New title')
      57. end
      58. 1 context 'when image' do
      59. 1 before do
      60. 2 click_link('Edit')
      61. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
      62. 2 click_on 'Update Book'
      63. end
      64. 1 it 'can add images to book' do
      65. 1 expect(book.reload.images.count).to eq(1)
      66. end
      67. 1 it 'can delete images from book' do
      68. 1 click_link('Edit')
      69. 1 click_link('Delete')
      70. 1 expect(book.reload.images.count).to eq(0)
      71. end
      72. end
      73. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      11. 7 >>>>>>> d0dc1f1 (Featire specs) =======
      12. 7 >>>>>>> 752f0c0 (Featire specs) =======
      13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
      14. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      16. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      18. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      19. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      20. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can create an category' do >>>>>>> 5b7749a (Fix)
      21. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('New Category') >>>>>>> 5b7749a (Fix)
      22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      23. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      24. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      25. 1 visit "books/#{book.id}"
      26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      27. >>>>>>> 5b7749a (Fix)
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      29. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) =======
      32. >>>>>>> 752f0c0 (Featire specs) =======
      33. >>>>>>> 4e81ea2 (Featire specs) =======
      34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      38. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      39. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      40. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      41. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= fill_in 'category[name]', with: category_name >>>>>>> 5b7749a (Fix)
      42. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      43. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      44. =======
      45. >>>>>>> d0dc1f1 (Featire specs) =======
      46. >>>>>>> 752f0c0 (Featire specs) =======
      47. >>>>>>> 4e81ea2 (Featire specs) =======
      48. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      51. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      52. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      53. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      54. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      55. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      56. 1 click_button('Create Category') <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      57. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(category_name) >>>>>>> 5b7749a (Fix)
      58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      59. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      60. =======
      61. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      62. 1 >>>>>>> 752f0c0 (Featire specs) =======
      63. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      64. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      65. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      66. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      67. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      68. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      69. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      70. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      71. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can delete an category' do >>>>>>> 5b7749a (Fix)
      72. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      73. 1 click_link('Delete')
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      75. >>>>>>> d0dc1f1 (Featire specs) =======
      76. >>>>>>> 752f0c0 (Featire specs) =======
      77. >>>>>>> 4e81ea2 (Featire specs) =======
      78. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      79. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      81. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      82. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      83. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      84. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      85. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      86. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      87. =======
      88. >>>>>>> d0dc1f1 (Featire specs) =======
      89. >>>>>>> 752f0c0 (Featire specs) =======
      90. >>>>>>> 4e81ea2 (Featire specs) =======
      91. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      92. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      93. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      94. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      95. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      96. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      97. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      98. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content('Catalog')
      99. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content(category.name) >>>>>>> 5b7749a (Fix)
      100. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      101. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      102. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      103. =======
      104. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      105. 1 >>>>>>> 752f0c0 (Featire specs) =======
      106. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      107. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      108. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      109. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      110. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      111. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      112. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      113. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      114. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can view an category' do >>>>>>> 5b7749a (Fix)
      115. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('View') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('View') >>>>>>> 5b7749a (Fix)
      116. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category.name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(category.name) >>>>>>> 5b7749a (Fix)
      117. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      118. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can edit an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can edit an category' do >>>>>>> 5b7749a (Fix)
      119. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('Edit') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('Edit') >>>>>>> 5b7749a (Fix)
      120. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= fill_in 'category[name]', with: 'New Genre' >>>>>>> 5b7749a (Fix)
      121. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_button('Update Category') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_button('Update Category') >>>>>>> 5b7749a (Fix)
      122. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      123. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      124. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      125. 1 =======
      126. >>>>>>> d0dc1f1 (Featire specs) =======
      127. >>>>>>> 752f0c0 (Featire specs) =======
      128. >>>>>>> 4e81ea2 (Featire specs) =======
      129. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      130. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      131. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      132. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      133. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      134. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      135. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content('New Genre') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('New Genre') >>>>>>> 5b7749a (Fix)
      136. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      137. end

      spec/feature/billing_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Billing', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      6. 2 let(:user) { create(:user) }
      7. 1 let(:attributes_for) { attributes_for(:billing) }
      8. 1 describe '#fill_in', js: true do
      9. 1 it 'fill in billing' do
      10. 1 sign_in(user)
      11. 1 visit edit_user_path(user.id)
      12. 1 within('div#billing.col-md-5.mb-40') do
      13. 1 find_all('div', class: 'form-group')[0] do
      14. fill_in :first_name, with: attributes_for[:first_name]
      15. end
      16. 1 find_all('div', class: 'form-group')[1] do
      17. fill_in :last_name, with: attributes_for[:last_name]
      18. end
      19. 1 find_all('div', class: 'form-group')[2] do
      20. fill_in :address, with: attributes_for[:address]
      21. end
      22. 1 find_all('div', class: 'form-group')[3] do
      23. fill_in :city, with: attributes_for[:city]
      24. end
      25. 1 find_all('div', class: 'form-group')[4] do
      26. fill_in :zip, with: attributes_for[:zip]
      27. end
      28. 1 find_all('div', class: 'form-group')[5] do
      29. fill_in :country, with: attributes_for[:country]
      30. end
      31. 1 find_all('div', class: 'form-group')[6] do
      32. fill_in :phone, with: attributes_for[:phone]
      33. end
      34. 1 click_on I18n.t('settings.save')
      35. end
      36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      37. end
      38. end
      39. end

      spec/feature/book_spec.rb

      100.0% lines covered

      104 relevant lines. 104 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book', type: :feature do
      2. 5 let(:category_one) { create(:category) }
      3. 3 let(:category_two) { create(:category) }
      4. 1 let(:params) do
      5. 4 { title: FFaker::Book.title,
      6. description: FFaker::Book.description,
      7. price_cents: FFaker::Number.rand(1..100),
      8. dimensions: FFaker::Book.cover,
      9. year_of_publication: FFaker::Number.rand(1900..2022),
      10. materials: 'Soft cover',
      11. quantity: FFaker::Number.rand(2..5) }
      12. end
      13. 7 let(:book) { create(:book).decorate }
      14. 1 describe '#show book' do
      15. 1 it 'show books info' do
      16. 1 visit "books/#{book.id}"
      17. 1 expect(page).to have_content(book.title)
      18. end
      19. 1 it 'clicked Beck to results' do
      20. 1 visit "books/#{book.id}"
      21. 1 find('a', class: 'general-back-link').click
      22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
      23. end
      24. 1 context 'when test read more' do
      25. 1 it 'show read more' do
      26. 1 visit "books/#{book.id}"
      27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
      28. end
      29. 1 it 'clicked read more', js: true do
      30. 1 visit "books/#{book.id}"
      31. 1 click_link I18n.t('book_page.read_more')
      32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
      33. end
      34. end
      35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      36. >>>>>>> d0dc1f1 (Featire specs) =======
      37. >>>>>>> 752f0c0 (Featire specs) =======
      38. >>>>>>> 4e81ea2 (Featire specs) =======
      39. >>>>>>> 08edf50 (Featire specs) =======
      40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      41. >>>>>>> 7a02bbe (Featire specs) =======
      42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      43. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      44. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 1 context 'when quantity changes', js: true do
      45. <<<<<<< HEAD <<<<<<< HEAD
      46. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      47. =======
      48. >>>>>>> d0dc1f1 (Featire specs) =======
      49. >>>>>>> 752f0c0 (Featire specs) =======
      50. >>>>>>> 4e81ea2 (Featire specs) =======
      51. >>>>>>> 08edf50 (Featire specs) =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      53. >>>>>>> 7a02bbe (Featire specs) =======
      54. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      55. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      56. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      57. >>>>>>> 5b7749a (Fix) 1 before do
      58. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      59. 2 visit "books/#{book.id}"
      60. <<<<<<< HEAD
      61. 2 find('a', class: 'inc').click
      62. end
      63. 1 it 'increase quantity' do
      64. 1 expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
      65. end
      66. 1 it 'decrease quantity' do
      67. 1 find('a', class: 'dec').click
      68. 1 expect(page).to have_content("€#{book.price}")
      69. end
      70. end
      71. end
      72. 1 describe '#catalog' do
      73. 1 describe 'filter by category' do
      74. 1 before do
      75. 2 category_one.books.create(params)
      76. 2 visit books_path
      77. end
      78. 1 after do
      79. 2 category_one.destroy
      80. end
      81. 1 it 'show book count for category' do
      82. 1 expect(page).to have_content(category_one.books.size)
      83. end
      84. 1 it 'filter book by category' do
      85. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      86. 1 click_on category_one.name
      87. end
      88. 1 expect(page).to have_content(category_one.books.first.title)
      89. end
      90. end
      91. 1 describe 'filter by all books' do
      92. 1 before do
      93. 2 category_one.books.create(params)
      94. 2 category_two.books.create(params)
      95. 2 visit books_path
      96. 2 click_on I18n.t('catalog_page.all')
      97. end
      98. 1 after do
      99. 2 category_one.destroy
      100. 2 category_two.destroy
      101. end
      102. 1 it 'shown books for first category' do
      103. 1 expect(page).to have_content(category_one.books.first.title)
      104. end
      105. 1 it 'shown books for second category' do
      106. 1 expect(page).to have_content(category_two.books.first.title)
      107. end
      108. end
      109. end
      110. 1 describe 'load_more' do
      111. 1 before do
      112. 3 24.times do
      113. 72 books << create(:book)
      114. end
      115. end
      116. 4 let(:books) { [] }
      117. 1 it 'show books without view more button' do
      118. 1 visit books_path
      119. 1 find('a', id: 'view_more', class: 'view_more').click
      120. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
      121. end
      122. 1 context 'when view more' do
      123. 1 it 'show books with view more button' do
      124. 1 visit books_path
      125. 1 expect(page).to have_css('a', class: 'view_more')
      126. end
      127. 1 it 'show loaded books', js: true do
      128. 1 visit books_path
      129. 1 find('a', class: 'view_more').click
      130. 1 expect(page).to have_content(books.last.title)
      131. end
      132. end
      133. end
      134. 1 describe 'sort' do
      135. 1 shared_examples 'sort test' do
      136. 5 it 'sort books' do
      137. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
      138. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
      139. 5 create(:book, title: 'Anna', price_cents: 23,
      140. created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
      141. 5 visit books_path
      142. 5 find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
      143. id: 'menu').click
      144. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
      145. 5 click_link button
      146. end
      147. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
      148. end
      149. end
      150. 1 context 'when sort by title A to Z' do
      151. 2 let(:button) { I18n.t('catalog_page.sorting.title.asc') }
      152. 2 let(:book_title) { 'Anna' }
      153. 1 include_examples 'sort test'
      154. end
      155. 1 context 'when sort by title Z to A' do
      156. 2 let(:button) { I18n.t('catalog_page.sorting.title.desc') }
      157. 2 let(:book_title) { 'Zimbabwe' }
      158. 1 include_examples 'sort test'
      159. end
      160. 1 context 'when sort by price High to Low' do
      161. 2 let(:button) { I18n.t('catalog_page.sorting.price.desc') }
      162. 2 let(:book_title) { 'Zimbabwe' }
      163. 1 include_examples 'sort test'
      164. end
      165. 1 context 'when sort by price Low to High' do
      166. 2 let(:button) { I18n.t('catalog_page.sorting.price.asc') }
      167. 2 let(:book_title) { 'Anna' }
      168. 1 include_examples 'sort test'
      169. end
      170. 1 context 'when sort by newest' do
      171. 2 let(:button) { I18n.t('catalog_page.sorting.newer_first') }
      172. 2 let(:book_title) { 'Zimbabwe' }
      173. 1 include_examples 'sort test'
      174. end
      175. end
      176. end
      <<<<<<< HEAD =======

      spec/feature/cart_spec.rb

      96.55% lines covered

      29 relevant lines. 28 lines covered and 1 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe 'Cart', type: :feature, js: true do
      3. 5 let(:book) { FactoryBot.create(:book) }
      4. 1 before do
      5. 4 book
      6. 4 visit book_path(book.id)
      7. 4 click_button I18n.t('book_page.add_to_card')
      8. end
      9. 1 describe '#add_book_to_order' do
      10. 1 it 'add book to order' do
      11. 1 within('span', class: 'shop-icon') do
      12. 1 expect(page).to have_content(1)
      13. end
      14. end
      15. end
      16. 1 describe '#quantity_change' do
      17. 1 it 'book quantity inc' do
      18. 1 visit orders_path
      19. 1 within("a#inc#{book.id}.input-link") do
      20. 1 find('i.fa.fa-plus.line-heaght-40').click
      21. end
      22. 1 sleep(2)
      23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
      24. end
      25. 1 it 'book quantity dec' do
      26. 1 visit orders_path
      27. 1 within("a#dec#{book.id}.input-link") do
      28. 1 find('i.fa.fa-minus.line-heaght-40').click
      29. end
      30. 1 sleep(2)
      31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
      32. end
      33. end
      34. 1 describe '#remove_book_from_cart' do
      35. 1 it 'book quantity change' do
      36. 1 visit orders_path
      37. 1 find('button.close.general-cart-close').click
      38. expect(page).to have_content(I18n.t('order.messages.delete'))
      39. end
      40. end
      41. end

      spec/feature/coupon_spec.rb

      100.0% lines covered

      30 relevant lines. 30 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
      4. 1 include_context 'with api request authentication helper methods'
      5. 1 include_context 'with api request global before and after hooks'
      6. 5 let(:user) { FactoryBot.create(:user) }
      7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
      8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
      9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
      10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
      11. 1 before do
      12. 4 sign_in(user)
      13. 4 order
      14. 4 order_book
      15. 4 visit orders_path
      16. end
      17. 1 describe '#valid coupon' do
      18. 1 before do
      19. 3 fill_in 'input', with: coupon.code
      20. 3 click_button I18n.t('order.apply')
      21. end
      22. 1 it 'sub price' do
      23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
      24. end
      25. 1 it 'use coupon' do
      26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
      27. end
      28. 1 it 'count price with coupon' do
      29. 1 expect(page).to have_content('Order Total: € 10.49')
      30. end
      31. end
      32. 1 describe '#invalid coupon' do
      33. 1 it 'show error message' do
      34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
      35. 1 click_button I18n.t('order.apply')
      36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
      37. end
      38. end
      39. end
      >>>>>>> 366b257 (Fix)

      spec/feature/home_spec.rb

      100.0% lines covered

      49 relevant lines. 49 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Home', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 1 describe 'Get Started' do
      5. 1 it 'on click move to catalog page' do
      6. 1 visit root_path
      7. 1 click_on 'Get Started'
      8. 1 expect(page).to have_content('Catalog')
      9. end
      10. end
      11. 1 describe 'navbar' do
      12. 2 let(:books_category) { create(:books_category) }
      13. 1 it 'on click home move to root-path' do
      14. 1 visit books_path
      15. 1 find('a', id: 'root').click
      16. 1 expect(page).to have_content('Get Started')
      17. end
      18. 1 it 'on click category name move to root-path with books that belong to this category' do
      19. 1 books_category
      20. 1 visit root_path
      21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      22. 1 within('ul', id: 'nav') do
      23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      24. end
      25. 1 expect(page).to have_content(books_category.category.books.first.title)
      26. end
      27. 1 context 'when guest' do
      28. 1 it 'on click login go to login page' do
      29. 1 visit root_path
      30. 1 within 'div', class: 'visible-xs' do
      31. 1 click_link I18n.t('header.log_in')
      32. end
      33. 1 expect(page).to have_content(I18n.t('header.log_in'))
      34. end
      35. 1 it 'on click sing up go to sing up page' do
      36. 1 visit root_path
      37. 1 within 'div', class: 'visible-xs' do
      38. 1 click_link I18n.t('header.sing_up')
      39. end
      40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
      41. end
      42. end
      43. 1 context 'when user', js: true do
      44. 4 let(:user) { create(:user) }
      45. 1 before do
      46. 3 sign_in(user)
      47. end
      48. 1 it 'on click account show settings' do
      49. 1 visit root_path
      50. 1 click_on I18n.t('header.account')
      51. 1 expect(page).to have_content(I18n.t('header.settings'))
      52. end
      53. 1 it 'on click account show log_out' do
      54. 1 visit root_path
      55. 1 click_on I18n.t('header.account')
      56. 1 expect(page).to have_content(I18n.t('header.log_out'))
      57. end
      58. 1 it 'log_out' do
      59. 1 visit root_path
      60. 1 click_on I18n.t('header.account')
      61. 1 click_on(I18n.t('header.log_out'), match: :first)
      62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
      63. end
      64. end
      65. end
      66. end

      spec/feature/login_spec.rb

      >>>>>>> a5d032d (Fix) 100.0% lines covered

      <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Login', type: :feature do
      2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#login' do
      4. 1 before do
      5. 2 visit new_user_session_path
      6. end
      7. 1 context 'when successfully login' do
      8. 1 it 'login' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: user_second.email
      11. 1 fill_in 'user_password', with: user_second.password
      12. 1 click_on I18n.t('header.log_in')
      13. end
      14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      15. end
      16. end
      17. 1 context 'when unsuccessfully login' do
      18. 1 it 'didn`t login' do
      19. 1 within 'form', class: 'new_user', id: 'new_user' do
      20. 1 fill_in 'user_email', with: user_second.email
      21. 1 fill_in 'user_password', with: 'wrong_password'
      22. 1 click_on I18n.t('header.log_in')
      23. end
      24. 1 expect(page).to have_text 'Invalid Email or password.'
      25. end
      26. end
      27. end
      28. end

      spec/feature/new_password_spec.rb

      100.0% lines covered

      13 relevant lines. 13 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'New Password', type: :feature do
      4. 3 let(:user) { FactoryBot.create(:user) }
      5. 1 describe '#new_password' do
      6. 1 it 'change password' do
      7. 1 user.reset_password('newPassword', 'newPassword')
      8. 1 expect(user.password).to eq('newPassword')
      9. end
      10. 1 it 'not validate password' do
      11. 1 visit new_user_password_path
      12. 1 fill_in 'email', with: user.email
      13. 1 click_on I18n.t('login.send_instructions')
      14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
      15. end
      16. end
      17. end

      spec/feature/registration_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Registration', type: :feature do
      2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#sing_up' do
      4. 1 before do
      5. 3 visit new_user_registration_path
      6. end
      7. 1 context 'when successfully sing_up' do
      8. 1 it 'sing_up users' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
      11. 1 fill_in 'user_password', with: user.password
      12. 1 fill_in 'user_password_confirmation', with: user.password
      13. 1 click_on I18n.t('header.sing_up')
      14. end
      15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      16. end
      17. end
      18. 1 context 'when users is already exits' do
      19. 1 it 'sing_up users' do
      20. 1 within 'form', class: 'new_user', id: 'new_user' do
      21. 1 fill_in 'user_email', with: user.email
      22. 1 fill_in 'user_password', with: user.password
      23. 1 fill_in 'user_password_confirmation', with: user.password
      24. 1 click_on I18n.t('header.sing_up')
      25. end
      26. 1 expect(page).to have_text('Email has already been taken')
      27. end
      28. end
      29. 1 context 'when unsuccessfully sing_up' do
      30. 1 it 'didn`t sing_up' do
      31. 1 within 'form', class: 'new_user', id: 'new_user' do
      32. 1 fill_in 'user_email', with: FFaker::Internet.email
      33. 1 fill_in 'user_password', with: 'password'
      34. 1 fill_in 'user_password_confirmation', with: 'wrong'
      35. 1 click_on I18n.t('header.sing_up')
      36. end
      37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      38. end
      39. end
      40. end
      41. end

      spec/feature/review_spec.rb

      100.0% lines covered

      28 relevant lines. 28 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Review', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 3 let(:user) { create(:user).decorate }
      5. 3 let(:book) { create(:book).decorate }
      6. 1 before do
      7. 2 sign_in(user)
      8. 2 visit book_path(book)
      9. end
      10. 1 shared_examples 'review' do
      11. 2 it 'review' do
      12. 2 find('i', id: rating).click
      13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
      14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
      15. 2 click_on I18n.t('review.post')
      16. 2 expect(page).to have_content(result)
      17. end
      18. end
      19. 1 describe '#post review', js: true do
      20. 1 context 'when review posted' do
      21. 2 let(:rating) { "star#{rand(1..5)}" }
      22. 2 let(:title_words) { 3 }
      23. 2 let(:body_words) { 5 }
      24. 2 let(:result) { user.name_or_email }
      25. 1 include_examples 'review'
      26. end
      27. 1 context 'when review not been posted' do
      28. 2 let(:rating) { "star#{rand(1..5)}" }
      29. 2 let(:title_words) { 80 }
      30. 2 let(:body_words) { 30 }
      31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      32. 1 include_examples 'review'
      33. end
      34. end
      35. end

      spec/feature/settings_spec.rb

      100.0% lines covered

      34 relevant lines. 34 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Settings', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 4 let(:user) { create(:user) }
      5. 1 before do
      6. 3 sign_in(user)
      7. 3 visit edit_user_path(user.id)
      8. 3 click_link I18n.t('settings.privacy')
      9. end
      10. 1 describe '#email_change' do
      11. 1 it 'change email' do
      12. 1 within('div', id: 'email') do
      13. 1 fill_in :email, with: FFaker::Internet.email
      14. 1 click_on I18n.t('settings.save')
      15. end
      16. 1 user.confirm
      17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      18. end
      19. end
      20. 1 describe '#password_change' do
      21. 1 context 'when error' do
      22. 1 it 'didnt change password' do
      23. 1 within('div', id: 'password') do
      24. 1 fill_in :current_password, with: user.password
      25. 1 fill_in :password, with: 'newPassword'
      26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
      27. 1 click_on I18n.t('settings.save')
      28. end
      29. 1 user.confirm
      30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
      31. end
      32. end
      33. 1 context 'when successful' do
      34. 1 it 'didnt change password' do
      35. 1 within('div', id: 'password') do
      36. 1 fill_in :current_password, with: user.password
      37. 1 fill_in :password, with: 'newPassword'
      38. 1 fill_in :password_confirmation, with: 'newPassword'
      39. 1 click_on I18n.t('settings.save')
      40. end
      41. 1 user.confirm
      42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
      43. end
      44. end
      45. end
      46. end

      spec/feature/shipping_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Shipping', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:user) { FactoryBot.create(:user) }
      5. 1 let(:attributes_for) { attributes_for(:shipping) }
      6. 1 describe '#fill_in', js: true do
      7. 1 it 'fill in shipping' do
      8. 1 sign_in(user)
      9. 1 visit edit_user_path(user.id)
      10. 1 within('div#shipping.col-md-5.mb-40') do
      11. 1 find_all('div', class: 'form-group')[0] do
      12. fill_in :first_name, with: attributes_for[:first_name]
      13. end
      14. 1 find_all('div', class: 'form-group')[1] do
      15. fill_in :last_name, with: attributes_for[:last_name]
      16. end
      17. 1 find_all('div', class: 'form-group')[2] do
      18. fill_in :address, with: attributes_for[:address]
      19. end
      20. 1 find_all('div', class: 'form-group')[3] do
      21. fill_in :city, with: attributes_for[:city]
      22. end
      23. 1 find_all('div', class: 'form-group')[4] do
      24. fill_in :zip, with: attributes_for[:zip]
      25. end
      26. 1 find_all('div', class: 'form-group')[5] do
      27. fill_in :country, with: attributes_for[:country]
      28. end
      29. 1 find_all('div', class: 'form-group')[6] do
      30. fill_in :phone, with: attributes_for[:phone]
      31. end
      32. 1 click_on I18n.t('settings.save')
      33. end
      34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      35. end
      36. end
      37. end

      spec/feature/user_spec.rb

      100.0% lines covered

      42 relevant lines. 42 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'User', type: :feature do
      2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
      3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
      4. 1 describe '#sing_up' do
      5. 1 context 'when successfully sing_up' do
      6. 1 before do
      7. 1 visit new_user_registration_path
      8. 1 within 'form', class: 'new_user', id: 'new_user' do
      9. 1 fill_in 'user_email', with: user.email
      10. 1 fill_in 'user_password', with: user.password
      11. 1 fill_in 'user_password_confirmation', with: user.password
      12. 1 click_on I18n.t('header.sing_up')
      13. end
      14. end
      15. 1 it 'sing_up user' do
      16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      17. end
      18. end
      19. 1 context 'when unsuccessfully sing_up' do
      20. 1 it 'didn`t sing_up' do
      21. 1 visit new_user_registration_path
      22. 1 within 'form', class: 'new_user', id: 'new_user' do
      23. 1 fill_in 'user_email', with: FFaker::Internet.email
      24. 1 fill_in 'user_password', with: 'wrong'
      25. 1 fill_in 'user_password_confirmation', with: 'wrong'
      26. 1 click_on I18n.t('header.sing_up')
      27. end
      28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      29. end
      30. end
      31. end
      32. 1 describe '#login' do
      33. 1 before do
      34. 2 user_second.confirm
      35. end
      36. 1 context 'when successfully login' do
      37. 1 it 'login' do
      38. 1 visit new_user_session_path
      39. 1 within 'form', class: 'new_user', id: 'new_user' do
      40. 1 fill_in 'user_email', with: user_second.email
      41. 1 fill_in 'user_password', with: user_second.password
      42. 1 click_on I18n.t('header.log_in')
      43. end
      44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      45. end
      46. end
      47. 1 context 'when unsuccessfully login' do
      48. 1 it 'didn`t login' do
      49. 1 visit new_user_session_path
      50. 1 within 'form', class: 'new_user', id: 'new_user' do
      51. 1 fill_in 'user_email', with: user_second.email
      52. 1 fill_in 'user_password', with: 'wrong_password'
      53. 1 click_on I18n.t('header.log_in')
      54. end
      55. 1 expect(page).to have_text 'Invalid Email or password.'
      56. end
      57. end
      58. end
      59. end

      spec/models/admin_user_spec.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AdminUser, type: :model do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:email) }
      5. 2 it { is_expected.to validate_presence_of(:password) }
      6. end
      7. end

      spec/models/author_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Author, type: :model do
      2. 1 describe 'author' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:first_name) }
      5. 2 it { is_expected.to validate_presence_of(:last_name) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      9. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      10. end
      11. end
      12. end

      spec/models/authors_book_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe AuthorsBook, type: :model do
      2. 1 describe 'authors_book' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:author) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:author) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/book_spec.rb

      100.0% lines covered

      16 relevant lines. 16 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Book, type: :model do
      2. 1 describe 'books' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:title) }
      5. 2 it { is_expected.to validate_presence_of(:description) }
      6. 2 it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
      7. 2 it { is_expected.to validate_presence_of(:year_of_publication) }
      8. 2 it { is_expected.to validate_presence_of(:quantity) }
      9. 2 it { is_expected.to validate_presence_of(:materials) }
      10. 2 it { is_expected.to validate_presence_of(:dimensions) }
      11. end
      12. 1 context 'when associations' do
      13. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      14. 2 it { is_expected.to have_many(:authors).through(:authors_books) }
      15. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      16. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
      17. 2 it { is_expected.to have_many(:reviews).dependent(:destroy) }
      18. end
      19. end
      20. end

      spec/models/books_category_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BooksCategory, type: :model do
      2. 1 describe 'books_categories' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:category) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:category) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/category_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Category, type: :model do
      2. 1 describe 'category' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:name) }
      5. end
      6. 1 context 'when associations' do
      7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      9. end
      10. end
      11. end

      spec/models/review_spec.rb

      100.0% lines covered

      14 relevant lines. 14 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe Review, type: :model do
      3. 1 describe 'review' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:title) }
      6. 2 it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      9 relevant lines. 9 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 let(:user) { FactoryBot.create(:user) }
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:email) }
      6. 2 it { is_expected.to validate_presence_of(:password) }
      7. end
      8. 1 context 'with associations' do
      9. 2 it { is_expected.to have_one(:billing) }
      10. 2 it { is_expected.to have_one(:shipping) }
      11. end
      12. end
      13. end

      spec/queryes/book_query_spec.rb

      100.0% lines covered

      45 relevant lines. 45 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe BookQuery do
      3. 1 shared_examples 'sort test' do
      4. 5 it 'sort' do
      5. 5 books
      6. 5 expect(test).to eq(result)
      7. end
      8. end
      9. 3 let(:titles) { %w[Adam Zimbabwe] }
      10. 1 let(:books_dates) do
      11. 1 ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
      12. end
      13. 1 describe 'all books sort' do
      14. 1 context 'when sort by title A to Z' do
      15. 1 let(:books) do
      16. 1 create(:book, title: titles.first)
      17. 1 create(:book, title: titles.second)
      18. end
      19. 2 let(:result) { titles.second }
      20. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
      21. 1 include_examples 'sort test'
      22. end
      23. 1 context 'when sort title Z to A' do
      24. 1 let(:books) do
      25. 1 create(:book, title: titles.first)
      26. 1 create(:book, title: titles.second)
      27. end
      28. 2 let(:result) { titles.first }
      29. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
      30. 1 include_examples 'sort test'
      31. end
      32. 1 context 'when sort by price High to Low' do
      33. 1 let(:books) do
      34. 1 create(:book, price_cents: 75)
      35. 1 create(:book, price_cents: 23)
      36. end
      37. 2 let(:result) { 75 }
      38. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
      39. 1 include_examples 'sort test'
      40. end
      41. 1 context 'when sort price Low to High' do
      42. 1 let(:books) do
      43. 1 create(:book, price_cents: 75)
      44. 1 create(:book, price_cents: 23)
      45. end
      46. 2 let(:result) { 23 }
      47. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
      48. 1 include_examples 'sort test'
      49. end
      50. 1 context 'when sort by Newest' do
      51. 1 let(:books) do
      52. 1 create(:book, created_at: books_dates.first)
      53. 1 create(:book, created_at: books_dates.second)
      54. end
      55. 2 let(:result) { books_dates.first }
      56. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
      57. 1 include_examples 'sort test'
      58. end
      59. end
      60. end

      spec/support/configs/capybara.rb

      100.0% lines covered

      19 relevant lines. 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed.
          
      1. 1 RSpec.describe 'Author' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. ======= >>>>>>> 824bb2b (Featire specs)
      5. 2 let(:first_name) { FFaker::Name.first_name }
      6. 2 let(:last_name) { FFaker::Name.last_name }
      7. 2 let(:new_name) { FFaker::Name.first_name }
      8. 2 let(:old_name) { author.first_name }
      9. 4 let(:author) { create(:author) }
      10. 1 before do
      11. 4 sign_in(create(:admin_user), :admin_user)
      12. end
      13. 1 it 'can create an author' do
      14. 1 visit 'admin/authors'
      15. 1 click_link('New Author')
      16. 1 fill_in 'author[first_name]', with: first_name
      17. 1 fill_in 'author[last_name]', with: last_name
      18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      19. end
      20. 1 it 'can delete an author' do
      21. 1 author
      22. 1 visit 'admin/authors'
      23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      24. end
      25. 1 it 'can view an author' do
      26. 1 author
      27. 1 visit 'admin/authors'
      28. 1 click_link('View')
      29. 1 expect(page).to have_content(author.first_name)
      30. end
      31. 1 it 'can edit an author' do
      32. 1 author
      33. 1 visit 'admin/authors'
      34. 1 click_link('Edit')
      35. 1 fill_in 'author[first_name]', with: new_name
      36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      37. end
      38. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD
      5. 7 =======
      6. =======
      7. >>>>>>> d0dc1f1 (Featire specs) =======
      8. >>>>>>> 752f0c0 (Featire specs) 5 >>>>>>> 93bdda9 (Featire specs) =======
      9. 7 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:book) { create(:book) } ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) let(:category_one) { FactoryBot.create(:category) }
      10. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { create(:book) } >>>>>>> 872e675 (Fix) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      11. 1 let(:params) do
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      13. 1 =======
      14. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      15. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      16. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      17. 4 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) { title: FFaker::Book.title,
      18. description: FFaker::Book.description,
      19. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      20. dimensions: FFaker::Book.cover,
      21. year_of_publication: FFaker::Number.rand(1900..2022),
      22. materials: 'Soft cover',
      23. quantity: FFaker::Number.rand(2..5) }
      24. end
      25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      26. 1 before do
      27. 6 sign_in(create(:admin_user), :admin_user)
      28. 6 book
      29. 6 visit 'admin/books'
      30. end
      31. 1 it 'can create an category' do
      32. 1 click_link('New Book')
      33. 1 fill_in 'book[title]', with: params[:title]
      34. 1 fill_in 'book[description]', with: params[:description]
      35. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
      36. 1 fill_in 'book[price_cents]', with: params[:price_cents]
      37. 1 fill_in 'book[materials]', with: params[:materials]
      38. 1 fill_in 'book[dimensions]', with: params[:dimensions]
      39. 1 fill_in 'book[quantity]', with: params[:quantity]
      40. 1 click_button('Create Book')
      41. 1 expect(page).to have_content(params[:title])
      42. end
      43. 1 it 'can delete an book' do
      44. 1 click_link('Delete')
      45. 1 expect(page).not_to have_content(book.title)
      46. end
      47. 1 it 'can view an book' do
      48. 1 click_link('View')
      49. 1 expect(page).to have_content(book.title)
      50. end
      51. 1 it 'can edit an book' do
      52. 1 click_link('Edit')
      53. 1 fill_in 'book[title]', with: 'New title'
      54. 1 click_button('Update Book')
      55. 1 expect(page).to have_content('New title')
      56. end
      57. 1 context 'when image' do
      58. 1 before do
      59. 2 click_link('Edit')
      60. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
      61. 2 click_on 'Update Book'
      62. end
      63. 1 it 'can add images to book' do
      64. 1 expect(book.reload.images.count).to eq(1)
      65. end
      66. 1 it 'can delete images from book' do
      67. 1 click_link('Edit')
      68. 1 click_link('Delete')
      69. 1 expect(book.reload.images.count).to eq(0)
      70. end
      71. end
      72. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) =======
      11. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      12. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      13. 7 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can create an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      15. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('New Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      17. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      18. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      19. 1 visit "books/#{book.id}"
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      21. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      23. =======
      24. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      25. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      26. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      27. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      28. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD fill_in 'category[name]', with: category_name >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      32. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      33. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      34. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      35. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      36. 1 click_button('Create Category') <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      37. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(category_name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      39. =======
      40. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      41. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      42. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      43. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      44. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can delete an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      46. 1 click_link('Delete')
      47. <<<<<<< HEAD <<<<<<< HEAD =======
      48. >>>>>>> d0dc1f1 (Featire specs) =======
      49. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      50. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      51. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      53. =======
      54. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      55. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      56. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      57. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      58. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) expect(page).to have_content('Catalog')
      59. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).not_to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      62. =======
      63. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      64. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      65. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      66. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      67. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can view an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      68. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('View') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      69. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      71. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can edit an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      72. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('Edit') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      73. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      74. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_button('Update Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      77. 1 =======
      78. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      79. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      80. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      81. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content('New Genre') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end
      83. end

      spec/feature/billing_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Billing', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      6. 2 let(:user) { create(:user) }
      7. 1 let(:attributes_for) { attributes_for(:billing) }
      8. 1 describe '#fill_in', js: true do
      9. 1 it 'fill in billing' do
      10. 1 sign_in(user)
      11. 1 visit edit_user_path(user.id)
      12. 1 within('div#billing.col-md-5.mb-40') do
      13. 1 find_all('div', class: 'form-group')[0] do
      14. fill_in :first_name, with: attributes_for[:first_name]
      15. end
      16. 1 find_all('div', class: 'form-group')[1] do
      17. fill_in :last_name, with: attributes_for[:last_name]
      18. end
      19. 1 find_all('div', class: 'form-group')[2] do
      20. fill_in :address, with: attributes_for[:address]
      21. end
      22. 1 find_all('div', class: 'form-group')[3] do
      23. fill_in :city, with: attributes_for[:city]
      24. end
      25. 1 find_all('div', class: 'form-group')[4] do
      26. fill_in :zip, with: attributes_for[:zip]
      27. end
      28. 1 find_all('div', class: 'form-group')[5] do
      29. fill_in :country, with: attributes_for[:country]
      30. end
      31. 1 find_all('div', class: 'form-group')[6] do
      32. fill_in :phone, with: attributes_for[:phone]
      33. end
      34. 1 click_on I18n.t('settings.save')
      35. end
      36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      37. end
      38. end
      39. end

      spec/feature/book_spec.rb

      100.0% lines covered

      104 relevant lines. 104 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book', type: :feature do
      2. 5 let(:category_one) { create(:category) }
      3. 3 let(:category_two) { create(:category) }
      4. 1 let(:params) do
      5. 4 { title: FFaker::Book.title,
      6. description: FFaker::Book.description,
      7. price_cents: FFaker::Number.rand(1..100),
      8. dimensions: FFaker::Book.cover,
      9. year_of_publication: FFaker::Number.rand(1900..2022),
      10. materials: 'Soft cover',
      11. quantity: FFaker::Number.rand(2..5) }
      12. end
      13. 7 let(:book) { create(:book).decorate }
      14. 1 describe '#show book' do
      15. 1 it 'show books info' do
      16. 1 visit "books/#{book.id}"
      17. 1 expect(page).to have_content(book.title)
      18. end
      19. 1 it 'clicked Beck to results' do
      20. 1 visit "books/#{book.id}"
      21. 1 find('a', class: 'general-back-link').click
      22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
      23. end
      24. 1 context 'when test read more' do
      25. 1 it 'show read more' do
      26. 1 visit "books/#{book.id}"
      27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
      28. end
      29. 1 it 'clicked read more', js: true do
      30. 1 visit "books/#{book.id}"
      31. 1 click_link I18n.t('book_page.read_more')
      32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
      33. end
      34. end
      35. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      36. >>>>>>> d0dc1f1 (Featire specs) =======
      37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      38. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      39. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= =======
      40. >>>>>>> 4e81ea2 (Featire specs) =======
      41. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      42. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 context 'when quantity changes', js: true do
      43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      44. =======
      45. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      46. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      47. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      48. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      49. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      50. >>>>>>> 4e81ea2 (Featire specs) =======
      51. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      53. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 before do
      54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      55. 2 visit "books/#{book.id}"
      56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      57. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'inc').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'inc').click >>>>>>> 5b7749a (Fix)
      58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      61. 1 =======
      62. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      63. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      64. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      65. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      66. 2 >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD
      67. 2 >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
      68. 2 >>>>>>> e3e66f3 (Featire specs) =======
      69. 1 >>>>>>> 5b7749a (Fix) it 'increase quantity' do
      70. <<<<<<< HEAD
      71. end
      72. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= =======
      73. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'increase quantity' do >>>>>>> 872e675 (Fix) ======= it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      75. =======
      76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= =======
      77. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      78. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      79. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      80. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      81. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
      82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      83. >>>>>>> d0dc1f1 (Featire specs) =======
      84. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      85. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      86. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      87. >>>>>>> 4e81ea2 (Featire specs) =======
      88. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) end
      89. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      90. =======
      91. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      92. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      93. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      94. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      95. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      96. >>>>>>> 4e81ea2 (Featire specs) =======
      97. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      98. >>>>>>> 5b7749a (Fix)
      99. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      100. =======
      101. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      102. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      103. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      104. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      105. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      106. >>>>>>> 4e81ea2 (Featire specs) =======
      107. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      108. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'decrease quantity' do >>>>>>> 872e675 (Fix) ======= it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'decrease quantity' do >>>>>>> 5b7749a (Fix)
      109. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      110. =======
      111. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      112. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      113. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      114. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      115. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      116. >>>>>>> 4e81ea2 (Featire specs) =======
      117. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      118. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dec').click ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price * 2}")
      119. end
      120. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'dec').click >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dec').click >>>>>>> 5b7749a (Fix)
      121. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity', js: true do ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'decrease quantity', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      122. 1 find('a', class: 'dec').click
      123. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) expect(page).to have_content("€#{book.price}")
      124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      125. end
      126. end
      127. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      128. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      130. end
      131. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      132. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      133. 1 describe '#catalog' do
      134. 1 describe 'filter by category' do
      135. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      136. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe '#catalog' do
      137. 1 describe 'filter by category' do
      138. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) before do
      139. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      140. =======
      141. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      142. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      143. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      144. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      145. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      146. >>>>>>> 4e81ea2 (Featire specs) =======
      147. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      148. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      149. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      150. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      151. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      152. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      153. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      154. >>>>>>> 5b7749a (Fix) 2 category_one.books.create(params)
      155. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      156. =======
      157. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      158. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      159. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      160. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      161. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      162. >>>>>>> 4e81ea2 (Featire specs) =======
      163. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      164. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      165. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      166. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      167. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      168. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      169. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      170. >>>>>>> 5b7749a (Fix) 2 visit books_path
      171. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      172. =======
      173. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      174. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      175. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      176. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      177. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      178. >>>>>>> 4e81ea2 (Featire specs) =======
      179. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      180. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      181. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      182. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      183. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      184. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      185. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      186. >>>>>>> 5b7749a (Fix) end
      187. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      188. =======
      189. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      190. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      191. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      192. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      193. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      194. >>>>>>> 4e81ea2 (Featire specs) =======
      195. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      196. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      197. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      198. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      199. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      200. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      201. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      202. >>>>>>> 5b7749a (Fix)
      203. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      204. =======
      205. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      206. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      207. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      208. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      209. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      210. >>>>>>> 4e81ea2 (Featire specs) =======
      211. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      212. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      213. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      214. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      215. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      216. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      217. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      218. >>>>>>> 5b7749a (Fix) 1 after do
      219. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      220. =======
      221. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      222. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      223. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      224. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      225. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      226. >>>>>>> 4e81ea2 (Featire specs) =======
      227. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      228. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      229. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      230. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      231. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      232. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      233. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      234. >>>>>>> 5b7749a (Fix) 2 category_one.destroy
      235. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      236. =======
      237. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      238. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      239. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      240. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      241. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      242. >>>>>>> 4e81ea2 (Featire specs) =======
      243. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      244. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      245. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      246. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      247. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      248. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      249. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      250. >>>>>>> 5b7749a (Fix) end
      251. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      252. =======
      253. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      254. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      255. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      256. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      257. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      258. >>>>>>> 4e81ea2 (Featire specs) =======
      259. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      260. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      261. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      262. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      263. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      264. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      265. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      266. >>>>>>> 5b7749a (Fix)
      267. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      268. =======
      269. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      270. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      271. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      272. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      273. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      274. >>>>>>> 4e81ea2 (Featire specs) =======
      275. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      276. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      277. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      278. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      279. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      280. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      281. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      282. >>>>>>> 5b7749a (Fix) 1 it 'show book count for category' do
      283. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      284. =======
      285. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      286. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      287. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      288. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      289. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      290. >>>>>>> 4e81ea2 (Featire specs) =======
      291. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      292. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      293. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      294. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      295. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      296. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      297. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      298. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.size)
      299. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      300. =======
      301. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      302. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      303. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      304. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      305. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      306. >>>>>>> 4e81ea2 (Featire specs) =======
      307. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      308. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      309. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      310. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      311. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      312. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      313. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      314. >>>>>>> 5b7749a (Fix) end
      315. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      316. =======
      317. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      318. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      319. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      320. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      321. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      322. >>>>>>> 4e81ea2 (Featire specs) =======
      323. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      324. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      325. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      326. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      327. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      328. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      329. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      330. >>>>>>> 5b7749a (Fix)
      331. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      332. 1 it 'filter book by category' do
      333. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      334. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      335. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'filter book by category' do
      336. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      337. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) click_on category_one.name
      338. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      339. =======
      340. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      341. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      342. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      343. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      344. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      345. >>>>>>> 4e81ea2 (Featire specs) =======
      346. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      347. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      348. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      349. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      350. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      351. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      352. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      353. >>>>>>> 5b7749a (Fix) end
      354. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      355. =======
      356. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      357. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      358. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      359. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      360. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      361. >>>>>>> 4e81ea2 (Featire specs) =======
      362. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      363. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      364. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      365. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      366. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      367. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      368. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      369. >>>>>>> 5b7749a (Fix)
      370. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      371. =======
      372. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      373. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      374. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      375. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      376. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      377. >>>>>>> 4e81ea2 (Featire specs) =======
      378. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      379. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      380. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      381. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      382. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      383. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      384. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      385. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.first.title)
      386. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      387. =======
      388. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      389. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      390. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      391. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      392. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      393. >>>>>>> 4e81ea2 (Featire specs) =======
      394. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      395. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      396. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      397. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      398. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      399. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      400. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      401. >>>>>>> 5b7749a (Fix) end
      402. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      403. =======
      404. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      405. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      406. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      407. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      408. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      409. >>>>>>> 4e81ea2 (Featire specs) =======
      410. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      411. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      412. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      413. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      414. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      415. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      416. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      417. >>>>>>> 5b7749a (Fix) end
      418. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      419. =======
      420. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      421. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      422. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      423. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      424. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      425. >>>>>>> 4e81ea2 (Featire specs) =======
      426. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      427. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      428. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      429. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      430. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      431. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      432. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      433. >>>>>>> 5b7749a (Fix)
      434. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      435. =======
      436. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      437. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      438. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      439. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      440. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      441. >>>>>>> 4e81ea2 (Featire specs) =======
      442. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      443. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      444. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      445. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      446. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      447. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      448. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      449. >>>>>>> 5b7749a (Fix) 1 describe 'filter by all books' do
      450. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      451. =======
      452. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      453. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      454. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      455. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      456. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      457. >>>>>>> 4e81ea2 (Featire specs) =======
      458. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      459. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      460. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      461. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      462. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      463. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      464. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      465. >>>>>>> 5b7749a (Fix) 1 before do
      466. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      467. =======
      468. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      469. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      470. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      471. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      472. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      473. >>>>>>> 4e81ea2 (Featire specs) =======
      474. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      475. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      476. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      477. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      478. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      479. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      480. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      481. >>>>>>> 5b7749a (Fix) 2 category_one.books.create(params)
      482. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      483. 2 category_two.books.create(params)
      484. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      485. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 5b7749a (Fix)
      486. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_on I18n.t('catalog_page.all') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_on I18n.t('catalog_page.all') >>>>>>> 5b7749a (Fix)
      487. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      488. 2 click_on 'All'
      489. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      490. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      491. =======
      492. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      493. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      494. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      495. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      496. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      497. >>>>>>> 4e81ea2 (Featire specs) =======
      498. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      499. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      500. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      501. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      502. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      503. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      504. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      505. >>>>>>> 5b7749a (Fix)
      506. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      507. =======
      508. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      509. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      510. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      511. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      512. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      513. >>>>>>> 4e81ea2 (Featire specs) =======
      514. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      515. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      516. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      517. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      518. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      519. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      520. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      521. >>>>>>> 5b7749a (Fix) 1 after do
      522. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      523. =======
      524. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      525. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      526. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      527. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      528. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      529. >>>>>>> 4e81ea2 (Featire specs) =======
      530. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      531. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      532. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      533. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      534. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      535. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      536. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      537. >>>>>>> 5b7749a (Fix) 2 category_one.destroy
      538. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      539. =======
      540. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      541. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      542. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      543. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      544. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      545. >>>>>>> 4e81ea2 (Featire specs) =======
      546. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      547. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      548. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      549. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      550. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      551. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      552. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      553. >>>>>>> 5b7749a (Fix) 2 category_two.destroy
      554. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      555. =======
      556. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      557. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      558. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      559. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      560. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      561. >>>>>>> 4e81ea2 (Featire specs) =======
      562. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      563. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      564. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      565. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      566. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      567. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      568. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      569. >>>>>>> 5b7749a (Fix) end
      570. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      571. =======
      572. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      573. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      574. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      575. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      576. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      577. >>>>>>> 4e81ea2 (Featire specs) =======
      578. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      579. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      580. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      581. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      582. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      583. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      584. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      585. >>>>>>> 5b7749a (Fix)
      586. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      587. =======
      588. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      589. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      590. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      591. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      592. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      593. >>>>>>> 4e81ea2 (Featire specs) =======
      594. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      595. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      596. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      597. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      598. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      599. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      600. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      601. >>>>>>> 5b7749a (Fix) 1 it 'shown books for first category' do
      602. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      603. =======
      604. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      605. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      606. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      607. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      608. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      609. >>>>>>> 4e81ea2 (Featire specs) =======
      610. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      611. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      612. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      613. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      614. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      615. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      616. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      617. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.first.title)
      618. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      619. =======
      620. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      621. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      622. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      623. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      624. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      625. >>>>>>> 4e81ea2 (Featire specs) =======
      626. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      627. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      628. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      629. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      630. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      631. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      632. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      633. >>>>>>> 5b7749a (Fix) end
      634. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      635. =======
      636. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      637. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      638. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      639. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      640. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      641. >>>>>>> 4e81ea2 (Featire specs) =======
      642. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      643. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      644. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      645. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      646. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      647. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      648. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      649. >>>>>>> 5b7749a (Fix)
      650. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      651. =======
      652. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      653. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      654. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      655. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      656. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      657. >>>>>>> 4e81ea2 (Featire specs) =======
      658. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      659. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      660. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      661. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      662. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      663. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      664. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      665. >>>>>>> 5b7749a (Fix) 1 it 'shown books for second category' do
      666. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      667. =======
      668. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      669. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      670. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      671. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      672. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      673. >>>>>>> 4e81ea2 (Featire specs) =======
      674. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      675. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      676. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      677. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      678. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      679. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      680. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      681. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_two.books.first.title)
      682. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      683. end
      684. end
      685. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      686. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      687. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      688. end
      689. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      690. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      691. =======
      692. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      693. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      694. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      695. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      696. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      697. >>>>>>> 4e81ea2 (Featire specs) =======
      698. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      699. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      700. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      701. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      702. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      703. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      704. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      705. >>>>>>> 5b7749a (Fix) 1 describe 'load_more' do
      706. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      707. =======
      708. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      709. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      710. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      711. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      712. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      713. >>>>>>> 4e81ea2 (Featire specs) =======
      714. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      715. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      716. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      717. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      718. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      719. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      720. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      721. >>>>>>> 5b7749a (Fix) 1 before do
      722. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      723. =======
      724. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      725. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      726. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      727. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      728. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      729. >>>>>>> 4e81ea2 (Featire specs) =======
      730. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      731. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      732. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      733. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      734. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      735. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      736. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      737. >>>>>>> 5b7749a (Fix) 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= 24.times do >>>>>>> 872e675 (Fix) ======= 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 5b7749a (Fix)
      738. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      739. =======
      740. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      741. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      742. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      743. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      744. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      745. >>>>>>> 4e81ea2 (Featire specs) =======
      746. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      747. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      748. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      749. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      750. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      751. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      752. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      753. >>>>>>> 5b7749a (Fix) 72 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) books << create(:book)
      754. end
      755. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      756. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      757. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      758. 4 =======
      759. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      760. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      761. 4 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      762. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      763. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      764. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      765. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      766. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      767. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      768. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      769. 4 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:books) { [] } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 5b7749a (Fix)
      770. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      771. 1 =======
      772. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      773. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      774. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      775. 4 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      776. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      777. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      778. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      779. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      780. 4 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      781. 4 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      782. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'show books without view more button' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'show books without view more button' do >>>>>>> 5b7749a (Fix)
      783. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      784. 1 visit books_path
      785. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      786. >>>>>>> d0dc1f1 (Featire specs) =======
      787. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      788. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      789. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      790. >>>>>>> 4e81ea2 (Featire specs) =======
      791. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      792. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      793. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      794. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      795. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      796. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      797. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      798. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      799. 1 it 'show books without view more button' do
      800. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      801. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 5b7749a (Fix)
      802. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 5b7749a (Fix)
      803. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      804. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
      805. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      806. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      807. =======
      808. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      809. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      810. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      811. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      812. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      813. >>>>>>> 4e81ea2 (Featire specs) =======
      814. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      815. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      816. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      817. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      818. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      819. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      820. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      821. >>>>>>> 5b7749a (Fix)
      822. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      823. 1 context 'when view more' do
      824. 1 it 'show books with view more button' do
      825. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      826. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 5b7749a (Fix)
      827. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      828. =======
      829. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      830. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      831. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      832. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      833. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      834. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      835. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      836. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      837. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      838. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      839. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      840. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_css('a', class: 'view_more') >>>>>>> 5b7749a (Fix)
      841. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      842. 1 expect(page).to have_css('a', class: 'view_more')
      843. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      844. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      845. =======
      846. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      847. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      848. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      849. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      850. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      851. >>>>>>> 4e81ea2 (Featire specs) =======
      852. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      853. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      854. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      855. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      856. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      857. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      858. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      859. >>>>>>> 5b7749a (Fix)
      860. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      861. =======
      862. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      863. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      864. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      865. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      866. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      867. >>>>>>> 4e81ea2 (Featire specs) =======
      868. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      869. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      870. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      871. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      872. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      873. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      874. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      875. >>>>>>> 5b7749a (Fix) 1 it 'show loaded books', js: true do
      876. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      877. 1 visit books_path
      878. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      879. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'view_more').click >>>>>>> 5b7749a (Fix)
      880. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(books.last.title) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 5b7749a (Fix)
      881. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      882. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      883. =======
      884. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      885. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      886. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      887. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      888. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      889. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      890. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      891. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      892. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      893. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      894. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      895. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      896. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      897. end
      898. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      899. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      900. =======
      901. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      902. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      903. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      904. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      905. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      906. >>>>>>> 4e81ea2 (Featire specs) =======
      907. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      908. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      909. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      910. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      911. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      912. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      913. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      914. >>>>>>> 5b7749a (Fix) 1 describe 'sort' do
      915. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      916. =======
      917. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      918. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      919. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      920. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      921. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      922. >>>>>>> 4e81ea2 (Featire specs) =======
      923. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      924. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      925. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      926. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      927. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      928. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      929. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      930. >>>>>>> 5b7749a (Fix) 1 shared_examples 'sort test' do
      931. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      932. =======
      933. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      934. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      935. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      936. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      937. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      938. >>>>>>> 4e81ea2 (Featire specs) =======
      939. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      940. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      941. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      942. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      943. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      944. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      945. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      946. >>>>>>> 5b7749a (Fix) 5 it 'sort books' do
      947. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      948. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
      949. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
      950. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      951. 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:book, title: 'Anna', price_cents: 23, >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= create(:book, title: 'Anna', price_cents: 23, >>>>>>> 5b7749a (Fix)
      952. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 872e675 (Fix) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 5b7749a (Fix)
      953. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      954. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      955. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      956. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
      957. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      958. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      959. >>>>>>> 5b7749a (Fix)
      960. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      961. =======
      962. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      963. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      964. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      965. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      966. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      967. >>>>>>> 4e81ea2 (Featire specs) =======
      968. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      969. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      970. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      971. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      972. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      973. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      974. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      975. >>>>>>> 5b7749a (Fix) 5 visit books_path
      976. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      977. =======
      978. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      979. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      980. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      981. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      982. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      983. >>>>>>> 4e81ea2 (Featire specs) =======
      984. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      985. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      986. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      987. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      988. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      989. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      990. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      991. >>>>>>> 5b7749a (Fix)
      992. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      993. =======
      994. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      995. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      996. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      997. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      998. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      999. >>>>>>> 4e81ea2 (Featire specs) =======
      1000. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1001. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      1002. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1003. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      1004. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      1005. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1006. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      1007. >>>>>>> 5b7749a (Fix) 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
      1008. id: 'menu').click <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      1009. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
      1010. 5 click_link button
      1011. end
      1012. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
      1013. end
      1014. end
      1015. 1 context 'when sort by title A to Z' do
      1016. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 5b7749a (Fix)
      1017. 2 let(:book_title) { 'Anna' }
      1018. 1 include_examples 'sort test'
      1019. end
      1020. 1 context 'when sort by title Z to A' do
      1021. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 5b7749a (Fix)
      1022. 2 let(:book_title) { 'Zimbabwe' }
      1023. 1 include_examples 'sort test'
      1024. end
      1025. 1 context 'when sort by price High to Low' do
      1026. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 5b7749a (Fix)
      1027. 2 let(:book_title) { 'Zimbabwe' }
      1028. 1 include_examples 'sort test'
      1029. end
      1030. 1 context 'when sort by price Low to High' do
      1031. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 5b7749a (Fix)
      1032. 2 let(:book_title) { 'Anna' }
      1033. 1 include_examples 'sort test'
      1034. end
      1035. 1 context 'when sort by newest' do
      1036. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 5b7749a (Fix)
      1037. 2 let(:book_title) { 'Zimbabwe' }
      1038. 1 include_examples 'sort test'
      1039. end
      1040. end
      1041. end

      spec/feature/cart_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe 'Cart', type: :feature, js: true do
      3. 5 let(:book) { FactoryBot.create(:book) }
      4. 1 before do
      5. 4 book
      6. 4 visit book_path(book.id)
      7. 4 click_button I18n.t('book_page.add_to_card')
      8. end
      9. 1 describe '#add_book_to_order' do
      10. 1 it 'add book to order' do
      11. 1 within('span', class: 'shop-icon') do
      12. 1 expect(page).to have_content(1)
      13. end
      14. end
      15. end
      16. 1 describe '#quantity_change' do
      17. 1 it 'book quantity inc' do
      18. 1 visit orders_path
      19. 1 within("a#inc#{book.id}.input-link") do
      20. 1 find('i.fa.fa-plus.line-heaght-40').click
      21. end
      22. 1 sleep(2)
      23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
      24. end
      25. 1 it 'book quantity dec' do
      26. 1 visit orders_path
      27. 1 within("a#dec#{book.id}.input-link") do
      28. 1 find('i.fa.fa-minus.line-heaght-40').click
      29. end
      30. 1 sleep(2)
      31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
      32. end
      33. end
      34. 1 describe '#remove_book_from_cart' do
      35. 1 it 'book quantity change' do
      36. 1 visit orders_path
      37. 1 find('button.close.general-cart-close').click
      38. 1 expect(page).to have_content(I18n.t('order.messages.delete'))
      39. end
      40. end
      41. end

      spec/feature/coupon_spec.rb

      100.0% lines covered

      30 relevant lines. 30 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
      4. 1 include_context 'with api request authentication helper methods'
      5. 1 include_context 'with api request global before and after hooks'
      6. 5 let(:user) { FactoryBot.create(:user) }
      7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
      8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
      9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
      10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
      11. 1 before do
      12. 4 sign_in(user)
      13. 4 order
      14. 4 order_book
      15. 4 visit orders_path
      16. end
      17. 1 describe '#valid coupon' do
      18. 1 before do
      19. 3 fill_in 'input', with: coupon.code
      20. 3 click_button I18n.t('order.apply')
      21. end
      22. 1 it 'sub price' do
      23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
      24. end
      25. 1 it 'use coupon' do
      26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
      27. end
      28. 1 it 'count price with coupon' do
      29. 1 expect(page).to have_content('Order Total: € 10.49')
      30. end
      31. end
      32. 1 describe '#invalid coupon' do
      33. 1 it 'show error message' do
      34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
      35. 1 click_button I18n.t('order.apply')
      36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
      37. end
      38. end
      39. end

      spec/feature/home_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 49 relevant lines. 49 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Home', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 1 describe 'Get Started' do
      5. 1 it 'on click move to catalog page' do
      6. 1 visit root_path
      7. 1 click_on 'Get Started'
      8. 1 expect(page).to have_content('Catalog')
      9. end
      10. end
      11. 1 describe 'navbar' do
      12. 2 let(:books_category) { create(:books_category) }
      13. 1 it 'on click home move to root-path' do
      14. 1 visit books_path
      15. 1 find('a', id: 'root').click
      16. 1 expect(page).to have_content('Get Started')
      17. end
      18. 1 it 'on click category name move to root-path with books that belong to this category' do
      19. 1 books_category
      20. 1 visit root_path
      21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      22. 1 within('ul', id: 'nav') do
      23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      24. end
      25. 1 expect(page).to have_content(books_category.category.books.first.title)
      26. end
      27. 1 context 'when guest' do
      28. 1 it 'on click login go to login page' do
      29. 1 visit root_path
      30. 1 within 'div', class: 'visible-xs' do
      31. 1 click_link I18n.t('header.log_in')
      32. end
      33. 1 expect(page).to have_content(I18n.t('header.log_in'))
      34. end
      35. 1 it 'on click sing up go to sing up page' do
      36. 1 visit root_path
      37. 1 within 'div', class: 'visible-xs' do
      38. 1 click_link I18n.t('header.sing_up')
      39. end
      40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
      41. end
      42. end
      43. 1 context 'when user', js: true do
      44. 4 let(:user) { create(:user) }
      45. 1 before do
      46. 3 sign_in(user)
      47. end
      48. 1 it 'on click account show settings' do
      49. 1 visit root_path
      50. 1 click_on I18n.t('header.account')
      51. 1 expect(page).to have_content(I18n.t('header.settings'))
      52. end
      53. 1 it 'on click account show log_out' do
      54. 1 visit root_path
      55. 1 click_on I18n.t('header.account')
      56. 1 expect(page).to have_content(I18n.t('header.log_out'))
      57. end
      58. 1 it 'log_out' do
      59. 1 visit root_path
      60. 1 click_on I18n.t('header.account')
      61. 1 click_on(I18n.t('header.log_out'), match: :first)
      62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
      63. end
      64. end
      65. end
      66. end

      spec/feature/login_spec.rb

      >>>>>>> a5d032d (Fix) 100.0% lines covered

      <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Login', type: :feature do
      2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#login' do
      4. 1 before do
      5. 2 visit new_user_session_path
      6. end
      7. 1 context 'when successfully login' do
      8. 1 it 'login' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: user_second.email
      11. 1 fill_in 'user_password', with: user_second.password
      12. 1 click_on I18n.t('header.log_in')
      13. end
      14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      15. end
      16. end
      17. 1 context 'when unsuccessfully login' do
      18. 1 it 'didn`t login' do
      19. 1 within 'form', class: 'new_user', id: 'new_user' do
      20. 1 fill_in 'user_email', with: user_second.email
      21. 1 fill_in 'user_password', with: 'wrong_password'
      22. 1 click_on I18n.t('header.log_in')
      23. end
      24. 1 expect(page).to have_text 'Invalid Email or password.'
      25. end
      26. end
      27. end
      28. end

      spec/feature/new_password_spec.rb

      100.0% lines covered

      13 relevant lines. 13 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'New Password', type: :feature do
      4. 3 let(:user) { FactoryBot.create(:user) }
      5. 1 describe '#new_password' do
      6. 1 it 'change password' do
      7. 1 user.reset_password('newPassword', 'newPassword')
      8. 1 expect(user.password).to eq('newPassword')
      9. end
      10. 1 it 'not validate password' do
      11. 1 visit new_user_password_path
      12. 1 fill_in 'email', with: user.email
      13. 1 click_on I18n.t('login.send_instructions')
      14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
      15. end
      16. end
      17. end

      spec/feature/registration_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Registration', type: :feature do
      2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#sing_up' do
      4. 1 before do
      5. 3 visit new_user_registration_path
      6. end
      7. 1 context 'when successfully sing_up' do
      8. 1 it 'sing_up users' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
      11. 1 fill_in 'user_password', with: user.password
      12. 1 fill_in 'user_password_confirmation', with: user.password
      13. 1 click_on I18n.t('header.sing_up')
      14. end
      15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      16. end
      17. end
      18. 1 context 'when users is already exits' do
      19. 1 it 'sing_up users' do
      20. 1 within 'form', class: 'new_user', id: 'new_user' do
      21. 1 fill_in 'user_email', with: user.email
      22. 1 fill_in 'user_password', with: user.password
      23. 1 fill_in 'user_password_confirmation', with: user.password
      24. 1 click_on I18n.t('header.sing_up')
      25. end
      26. 1 expect(page).to have_text('Email has already been taken')
      27. end
      28. end
      29. 1 context 'when unsuccessfully sing_up' do
      30. 1 it 'didn`t sing_up' do
      31. 1 within 'form', class: 'new_user', id: 'new_user' do
      32. 1 fill_in 'user_email', with: FFaker::Internet.email
      33. 1 fill_in 'user_password', with: 'password'
      34. 1 fill_in 'user_password_confirmation', with: 'wrong'
      35. 1 click_on I18n.t('header.sing_up')
      36. end
      37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      38. end
      39. end
      40. end
      41. end

      spec/feature/review_spec.rb

      100.0% lines covered

      28 relevant lines. 28 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Review', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 3 let(:user) { create(:user).decorate }
      5. 3 let(:book) { create(:book).decorate }
      6. 1 before do
      7. 2 sign_in(user)
      8. 2 visit book_path(book)
      9. end
      10. 1 shared_examples 'review' do
      11. 2 it 'review' do
      12. 2 find('i', id: rating).click
      13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
      14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
      15. 2 click_on I18n.t('review.post')
      16. 2 expect(page).to have_content(result)
      17. end
      18. end
      19. 1 describe '#post review', js: true do
      20. 1 context 'when review posted' do
      21. 2 let(:rating) { "star#{rand(1..5)}" }
      22. 2 let(:title_words) { 3 }
      23. 2 let(:body_words) { 5 }
      24. 2 let(:result) { user.name_or_email }
      25. 1 include_examples 'review'
      26. end
      27. 1 context 'when review not been posted' do
      28. 2 let(:rating) { "star#{rand(1..5)}" }
      29. 2 let(:title_words) { 80 }
      30. 2 let(:body_words) { 30 }
      31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      32. 1 include_examples 'review'
      33. end
      34. end
      35. end

      spec/feature/settings_spec.rb

      100.0% lines covered

      34 relevant lines. 34 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Settings', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 4 let(:user) { create(:user) }
      5. 1 before do
      6. 3 sign_in(user)
      7. 3 visit edit_user_path(user.id)
      8. 3 click_link I18n.t('settings.privacy')
      9. end
      10. 1 describe '#email_change' do
      11. 1 it 'change email' do
      12. 1 within('div', id: 'email') do
      13. 1 fill_in :email, with: FFaker::Internet.email
      14. 1 click_on I18n.t('settings.save')
      15. end
      16. 1 user.confirm
      17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      18. end
      19. end
      20. 1 describe '#password_change' do
      21. 1 context 'when error' do
      22. 1 it 'didnt change password' do
      23. 1 within('div', id: 'password') do
      24. 1 fill_in :current_password, with: user.password
      25. 1 fill_in :password, with: 'newPassword'
      26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
      27. 1 click_on I18n.t('settings.save')
      28. end
      29. 1 user.confirm
      30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
      31. end
      32. end
      33. 1 context 'when successful' do
      34. 1 it 'didnt change password' do
      35. 1 within('div', id: 'password') do
      36. 1 fill_in :current_password, with: user.password
      37. 1 fill_in :password, with: 'newPassword'
      38. 1 fill_in :password_confirmation, with: 'newPassword'
      39. 1 click_on I18n.t('settings.save')
      40. end
      41. 1 user.confirm
      42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
      43. end
      44. end
      45. end
      46. end

      spec/feature/shipping_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Shipping', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:user) { FactoryBot.create(:user) }
      5. 1 let(:attributes_for) { attributes_for(:shipping) }
      6. 1 describe '#fill_in', js: true do
      7. 1 it 'fill in shipping' do
      8. 1 sign_in(user)
      9. 1 visit edit_user_path(user.id)
      10. 1 within('div#shipping.col-md-5.mb-40') do
      11. 1 find_all('div', class: 'form-group')[0] do
      12. fill_in :first_name, with: attributes_for[:first_name]
      13. end
      14. 1 find_all('div', class: 'form-group')[1] do
      15. fill_in :last_name, with: attributes_for[:last_name]
      16. end
      17. 1 find_all('div', class: 'form-group')[2] do
      18. fill_in :address, with: attributes_for[:address]
      19. end
      20. 1 find_all('div', class: 'form-group')[3] do
      21. fill_in :city, with: attributes_for[:city]
      22. end
      23. 1 find_all('div', class: 'form-group')[4] do
      24. fill_in :zip, with: attributes_for[:zip]
      25. end
      26. 1 find_all('div', class: 'form-group')[5] do
      27. fill_in :country, with: attributes_for[:country]
      28. end
      29. 1 find_all('div', class: 'form-group')[6] do
      30. fill_in :phone, with: attributes_for[:phone]
      31. end
      32. 1 click_on I18n.t('settings.save')
      33. end
      34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      35. end
      36. end
      37. end

      spec/feature/user_spec.rb

      100.0% lines covered

      42 relevant lines. 42 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'User', type: :feature do
      2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
      3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
      4. 1 describe '#sing_up' do
      5. 1 context 'when successfully sing_up' do
      6. 1 before do
      7. 1 visit new_user_registration_path
      8. 1 within 'form', class: 'new_user', id: 'new_user' do
      9. 1 fill_in 'user_email', with: user.email
      10. 1 fill_in 'user_password', with: user.password
      11. 1 fill_in 'user_password_confirmation', with: user.password
      12. 1 click_on I18n.t('header.sing_up')
      13. end
      14. end
      15. 1 it 'sing_up user' do
      16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      17. end
      18. end
      19. 1 context 'when unsuccessfully sing_up' do
      20. 1 it 'didn`t sing_up' do
      21. 1 visit new_user_registration_path
      22. 1 within 'form', class: 'new_user', id: 'new_user' do
      23. 1 fill_in 'user_email', with: FFaker::Internet.email
      24. 1 fill_in 'user_password', with: 'wrong'
      25. 1 fill_in 'user_password_confirmation', with: 'wrong'
      26. 1 click_on I18n.t('header.sing_up')
      27. end
      28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      29. end
      30. end
      31. end
      32. 1 describe '#login' do
      33. 1 before do
      34. 2 user_second.confirm
      35. end
      36. 1 context 'when successfully login' do
      37. 1 it 'login' do
      38. 1 visit new_user_session_path
      39. 1 within 'form', class: 'new_user', id: 'new_user' do
      40. 1 fill_in 'user_email', with: user_second.email
      41. 1 fill_in 'user_password', with: user_second.password
      42. 1 click_on I18n.t('header.log_in')
      43. end
      44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      45. end
      46. end
      47. 1 context 'when unsuccessfully login' do
      48. 1 it 'didn`t login' do
      49. 1 visit new_user_session_path
      50. 1 within 'form', class: 'new_user', id: 'new_user' do
      51. 1 fill_in 'user_email', with: user_second.email
      52. 1 fill_in 'user_password', with: 'wrong_password'
      53. 1 click_on I18n.t('header.log_in')
      54. end
      55. 1 expect(page).to have_text 'Invalid Email or password.'
      56. end
      57. end
      58. end
      59. end

      spec/models/admin_user_spec.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe AdminUser, type: :model do ======= RSpec.describe 'Homes', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe AdminUser, type: :model do >>>>>>> 5b7749a (Fix)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'when validations' do ======= describe 'Get Started' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'Get Started' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'Get Started' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 5b7749a (Fix)
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      5. 2 =======
      6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      7. 1 >>>>>>> 752f0c0 (Featire specs) =======
      8. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      15. 2 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:email) } ======= it 'on click move to catalog page' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'on click move to catalog page' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:email) } >>>>>>> 5b7749a (Fix)
      16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      17. 2 =======
      18. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      19. 1 >>>>>>> 752f0c0 (Featire specs) =======
      20. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      21. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      22. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      23. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      24. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      25. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      26. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      27. 2 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:password) } ======= visit root_path >>>>>>> d0dc1f1 (Featire specs) ======= visit root_path >>>>>>> 752f0c0 (Featire specs) ======= visit root_path >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit root_path >>>>>>> 08edf50 (Featire specs) ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit root_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit root_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:password) } >>>>>>> 5b7749a (Fix)
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      29. 1 click_on 'Get Started'
      30. 1 expect(page).to have_content('Catalog')
      31. end
      32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      34. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      35. 1 describe 'navbar' do
      36. 2 let(:books_category) { FactoryBot.create(:books_category) }
      37. 1 it 'on click home move to root-path' do
      38. 1 visit books_path
      39. 1 find('a', id: 'root').click
      40. 1 expect(page).to have_content('Get Started')
      41. end
      42. 1 it 'on click category name move to root-path with books that belong to this category' do
      43. 1 books_category
      44. 1 visit root_path
      45. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      46. 1 within('ul', id: 'nav') do
      47. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      48. end
      49. 1 expect(page).to have_content(books_category.category.books.first.title)
      50. end
      51. end
      52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      53. >>>>>>> 5b7749a (Fix) end

      spec/models/author_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Author, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 5b7749a (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:first_name) }
      6. 2 it { is_expected.to validate_presence_of(:last_name) }
      7. end
      8. <<<<<<< HEAD =======
      9. >>>>>>> d0dc1f1 (Featire specs) =======
      10. >>>>>>> 752f0c0 (Featire specs) =======
      11. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      12. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      13. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      14. >>>>>>> 08edf50 (Featire specs) =======
      15. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      17. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      18. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      19. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      21. =======
      22. >>>>>>> d0dc1f1 (Featire specs) =======
      23. >>>>>>> 752f0c0 (Featire specs) =======
      24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      27. >>>>>>> 08edf50 (Featire specs) =======
      28. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      29. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      30. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      31. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      32. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      33. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 5b7749a (Fix)
      34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      35. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      36. 1 describe 'author' do
      37. 1 context 'when validations' do
      38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      39. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:authors_books).dependent(:destroy) } >>>>>>> 5b7749a (Fix)
      40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      41. =======
      42. >>>>>>> d0dc1f1 (Featire specs) =======
      43. >>>>>>> 752f0c0 (Featire specs) =======
      44. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      45. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      46. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      47. >>>>>>> 08edf50 (Featire specs) =======
      48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      49. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      51. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      52. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      53. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:books).through(:authors_books) } >>>>>>> 5b7749a (Fix)
      54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      55. =======
      56. >>>>>>> d0dc1f1 (Featire specs) =======
      57. >>>>>>> 752f0c0 (Featire specs) =======
      58. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      59. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      60. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      61. >>>>>>> 08edf50 (Featire specs) =======
      62. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      63. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      64. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      65. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      66. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      67. >>>>>>> 5b7749a (Fix) end
      68. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      69. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      70. 1 context 'when associations' do
      71. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      72. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      73. end
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      75. >>>>>>> 5b7749a (Fix) end
      76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      77. =======
      78. >>>>>>> d0dc1f1 (Featire specs) =======
      79. >>>>>>> 752f0c0 (Featire specs) =======
      80. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      81. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      82. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      83. >>>>>>> 08edf50 (Featire specs) =======
      84. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      85. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      86. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      87. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      88. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      89. >>>>>>> 5b7749a (Fix) end

      spec/models/authors_book_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) RSpec.describe AuthorsBook, type: :model do
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      4. =======
      5. >>>>>>> d0dc1f1 (Featire specs) =======
      6. >>>>>>> 752f0c0 (Featire specs) =======
      7. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      10. >>>>>>> 08edf50 (Featire specs) =======
      11. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      12. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      13. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      14. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      15. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      16. >>>>>>> 5b7749a (Fix) 1 describe 'authors_book' do
      17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      18. =======
      19. >>>>>>> d0dc1f1 (Featire specs) =======
      20. >>>>>>> 752f0c0 (Featire specs) =======
      21. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      22. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      23. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      24. >>>>>>> 08edf50 (Featire specs) =======
      25. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      26. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      27. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      28. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      29. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      30. >>>>>>> 5b7749a (Fix) 1 context 'when validations' do
      31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      32. 2 it { is_expected.to validate_presence_of(:book) }
      33. 2 it { is_expected.to validate_presence_of(:author) }
      34. end
      35. 1 context 'when associations' do
      36. 2 it { is_expected.to belong_to(:author) }
      37. 2 it { is_expected.to belong_to(:book) }
      38. end
      39. end
      40. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      7. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } >>>>>>> 5b7749a (Fix)
      8. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } >>>>>>> 5b7749a (Fix)
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      13. <<<<<<< HEAD =======
      14. >>>>>>> d0dc1f1 (Featire specs) =======
      15. >>>>>>> 752f0c0 (Featire specs) =======
      16. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      17. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      19. >>>>>>> 08edf50 (Featire specs) =======
      20. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      21. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      22. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      23. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      24. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      26. =======
      27. >>>>>>> d0dc1f1 (Featire specs) =======
      28. >>>>>>> 752f0c0 (Featire specs) =======
      29. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      30. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      32. >>>>>>> 08edf50 (Featire specs) =======
      33. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      34. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      35. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      36. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      37. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      38. >>>>>>> 5b7749a (Fix)
      39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      40. 1 context 'when not validations' do
      41. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      42. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      43. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      44. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      45. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      46. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      47. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      48. end
      49. <<<<<<< HEAD =======
      50. >>>>>>> d0dc1f1 (Featire specs) =======
      51. >>>>>>> 752f0c0 (Featire specs) =======
      52. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      55. >>>>>>> 08edf50 (Featire specs) =======
      56. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      57. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      58. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      59. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      60. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 1 context 'when associations' do
      61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      62. =======
      63. >>>>>>> d0dc1f1 (Featire specs) =======
      64. >>>>>>> 752f0c0 (Featire specs) =======
      65. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      66. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      68. >>>>>>> 08edf50 (Featire specs) =======
      69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      70. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      72. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      73. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      74. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:user) } >>>>>>> 5b7749a (Fix)
      75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      76. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      77. 2 it { is_expected.to belong_to(:book) }
      78. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      79. >>>>>>> 5b7749a (Fix) end
      80. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      81. =======
      82. >>>>>>> d0dc1f1 (Featire specs) =======
      83. >>>>>>> 752f0c0 (Featire specs) =======
      84. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      85. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      86. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      87. >>>>>>> 08edf50 (Featire specs) =======
      88. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      89. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      90. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      91. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      92. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      93. >>>>>>> 5b7749a (Fix) end
      94. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      95. =======
      96. >>>>>>> d0dc1f1 (Featire specs) =======
      97. >>>>>>> 752f0c0 (Featire specs) =======
      98. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      99. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      100. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      101. >>>>>>> 08edf50 (Featire specs) =======
      102. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      103. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      104. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      105. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      106. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      107. >>>>>>> 5b7749a (Fix) end

      spec/models/book_spec.rb

      100.0% lines covered

      16 relevant lines. 16 lines covered and 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Book, type: :model do >>>>>>> 5b7749a (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) =======
      6. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      7. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      9. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      11. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      12. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      13. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= describe 'books' do >>>>>>> 5b7749a (Fix)
      14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Book, type: :model do
      15. 1 describe 'books' do
      16. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) context 'when validations' do
      17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      18. 2 it { is_expected.to validate_presence_of(:title) }
      19. 2 it { is_expected.to validate_presence_of(:description) }
      20. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      21. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } >>>>>>> 5b7749a (Fix)
      22. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:year_of_publication) } ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 5b7749a (Fix)
      23. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:quantity) } >>>>>>> 5b7749a (Fix)
      24. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:materials) } >>>>>>> 5b7749a (Fix)
      25. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) }
      26. 2 it { is_expected.to validate_presence_of(:materials) }
      27. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) it { is_expected.to validate_presence_of(:dimensions) }
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      29. =======
      30. >>>>>>> d0dc1f1 (Featire specs) =======
      31. >>>>>>> 752f0c0 (Featire specs) =======
      32. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      33. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      34. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      35. >>>>>>> 08edf50 (Featire specs) =======
      36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      38. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      39. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      40. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      41. >>>>>>> 5b7749a (Fix) end
      42. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      43. =======
      44. >>>>>>> d0dc1f1 (Featire specs) =======
      45. >>>>>>> 752f0c0 (Featire specs) =======
      46. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      47. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      49. >>>>>>> 08edf50 (Featire specs) =======
      50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      51. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      52. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      53. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      54. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      55. >>>>>>> 5b7749a (Fix)
      56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      57. =======
      58. >>>>>>> d0dc1f1 (Featire specs) =======
      59. >>>>>>> 752f0c0 (Featire specs) =======
      60. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      61. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      62. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      63. >>>>>>> 08edf50 (Featire specs) =======
      64. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      65. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      66. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      67. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      68. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      69. >>>>>>> 5b7749a (Fix) 1 context 'when associations' do
      70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      71. =======
      72. >>>>>>> d0dc1f1 (Featire specs) =======
      73. >>>>>>> 752f0c0 (Featire specs) =======
      74. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      75. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      77. >>>>>>> 08edf50 (Featire specs) =======
      78. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      79. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      80. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      81. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      82. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      83. >>>>>>> 5b7749a (Fix) 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      84. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      85. =======
      86. >>>>>>> d0dc1f1 (Featire specs) =======
      87. >>>>>>> 752f0c0 (Featire specs) =======
      88. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      89. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      90. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      91. >>>>>>> 08edf50 (Featire specs) =======
      92. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      93. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      94. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      95. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      96. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      97. >>>>>>> 5b7749a (Fix) 2 it { is_expected.to have_many(:authors).through(:authors_books) }
      98. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      99. =======
      100. >>>>>>> d0dc1f1 (Featire specs) =======
      101. >>>>>>> 752f0c0 (Featire specs) =======
      102. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      103. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      104. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      105. >>>>>>> 08edf50 (Featire specs) =======
      106. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      107. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      108. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      109. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      110. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      111. >>>>>>> 5b7749a (Fix)
      112. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      113. =======
      114. >>>>>>> d0dc1f1 (Featire specs) =======
      115. >>>>>>> 752f0c0 (Featire specs) =======
      116. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      117. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      118. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      119. >>>>>>> 08edf50 (Featire specs) =======
      120. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      121. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      122. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      123. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      124. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      125. >>>>>>> 5b7749a (Fix) 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      126. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      127. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
      128. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      129. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:reviews).dependent(:destroy) } >>>>>>> 5b7749a (Fix)
      130. end
      131. end
      132. end

      spec/models/books_category_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BooksCategory, type: :model do
      2. 1 describe 'books_categories' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:category) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:category) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/category_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Category, type: :model do
      2. 1 describe 'category' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:name) }
      5. end
      6. 1 context 'when associations' do
      7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      9. end
      10. end
      11. end

      spec/models/order_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 6 relevant lines. 6 lines covered and >>>>>>> 5b7749a (Fix) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Review, type: :model do ======= RSpec.describe BooksCategory, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Order, type: :model do
      3. 1 describe 'order' do
      4. 1 context 'when associations' do
      5. 2 it { is_expected.to have_many(:order_books).dependent(:destroy) }
      6. 2 it { is_expected.to have_many(:books).through(:order_books) }
      7. end
      8. end
      9. end

      spec/models/review_spec.rb

      100.0% lines covered

      14 relevant lines. 14 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe Review, type: :model do >>>>>>> 5b7749a (Fix)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe 'review' do ======= describe 'books_categories' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'books_categories' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'books_categories' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= describe 'review' do >>>>>>> 5b7749a (Fix)
      4. 1 context 'when validations' do
      5. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:title) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 5b7749a (Fix)
      6. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 describe 'author' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:email) }
      5. 2 it { is_expected.to validate_presence_of(:password) } <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      6. end
      7. <<<<<<< HEAD
      8. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'with associations' do ======= context 'when associations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when associations' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when associations' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when associations' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      9. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:billing) } ======= it { is_expected.to belong_to(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      10. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:shipping) } ======= it { is_expected.to belong_to(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      11. end
      12. end
      13. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)

      spec/queryes/book_query_spec.rb

      =======

      spec/models/category_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 752f0c0 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======

      spec/models/category_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/models/category_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======

      spec/models/category_spec.rb

      >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======

      spec/models/category_spec.rb

      >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe BookQuery do ======= RSpec.describe Category, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) shared_examples 'sort test' do ======= describe 'category' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'category' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'category' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'category' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      5. 5 =======
      6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      7. 1 >>>>>>> 752f0c0 (Featire specs) =======
      8. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'sort' do ======= context 'when validations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when validations' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when validations' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when validations' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      15. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      16. 5 =======
      17. 2 >>>>>>> d0dc1f1 (Featire specs) =======
      18. 2 >>>>>>> 752f0c0 (Featire specs) =======
      19. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      20. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      21. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      22. 2 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      23. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      24. 2 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      25. 2 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) books ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      27. 5 expect(test).to eq(result)
      28. =======
      29. >>>>>>> d0dc1f1 (Featire specs) =======
      30. >>>>>>> 752f0c0 (Featire specs) =======
      31. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      32. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      33. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      34. >>>>>>> 08edf50 (Featire specs) =======
      35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      36. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      37. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      38. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      39. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      41. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      42. 1 context 'when associations' do
      43. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      44. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      45. end
      46. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      47. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      48. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages)

      spec/models/user_spec.rb

      100.0% lines covered

      3 relevant lines. 3 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe User, type: :model do
      3. 1 pending "add some examples to (or delete) #{__FILE__}"
      4. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)

      spec/rails_helper.rb

      87.5% lines covered

      16 relevant lines. 14 lines covered and 2 lines missed.
          
      1. 1 require 'spec_helper'
      2. 1 ENV['RAILS_ENV'] ||= 'test'
      3. 1 require_relative '../config/environment'
      4. 1 abort('The Rails environment is running in production mode!') if Rails.env.production?
      5. 1 require 'rspec/rails'
      6. 1 require 'shoulda-matchers'
      7. ======= >>>>>>> 5b7749a (Fix)
      8. 1 context 'with associations' do
      9. 2 it { is_expected.to have_one(:billing) }
      10. 2 it { is_expected.to have_one(:shipping) }
      11. end
      12. end
      13. end

      spec/queryes/book_query_spec.rb

      100.0% lines covered

      45 relevant lines. 45 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe BookQuery do
      3. 1 shared_examples 'sort test' do
      4. 5 it 'sort' do
      5. 5 books
      6. 5 expect(test).to eq(result)
      7. end
      8. end
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      11. 3 =======
      12. >>>>>>> d0dc1f1 (Featire specs) =======
      13. >>>>>>> 752f0c0 (Featire specs) =======
      14. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      16. >>>>>>> 7a02bbe (Featire specs) =======
      17. >>>>>>> 4552227 (Featire specs) =======
      18. 3 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= begin >>>>>>> d0dc1f1 (Featire specs) ======= begin >>>>>>> 752f0c0 (Featire specs) ======= begin >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= begin >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= begin >>>>>>> 08edf50 (Featire specs) ======= begin >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= begin >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:titles) { %w[Adam Zimbabwe] } >>>>>>> 5b7749a (Fix)
      19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:books_dates) do ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> d0dc1f1 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:books_dates) do >>>>>>> 5b7749a (Fix)
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      21. 1 =======
      22. >>>>>>> d0dc1f1 (Featire specs) =======
      23. >>>>>>> 752f0c0 (Featire specs) =======
      24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      26. >>>>>>> 7a02bbe (Featire specs) =======
      27. >>>>>>> 4552227 (Featire specs) =======
      28. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> d0dc1f1 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] >>>>>>> 5b7749a (Fix)
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) =======
      32. >>>>>>> 752f0c0 (Featire specs) =======
      33. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      34. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      35. >>>>>>> 08edf50 (Featire specs) =======
      36. >>>>>>> 7a02bbe (Featire specs) =======
      37. >>>>>>> 4552227 (Featire specs) =======
      38. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) end ======= puts e.to_s.strip >>>>>>> d0dc1f1 (Featire specs) ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) ======= puts e.to_s.strip >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= end >>>>>>> 5b7749a (Fix)
      39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      40. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      41. exit 1
      42. end
      43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
      44. >>>>>>> 5b7749a (Fix)
      45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      46. 1 describe 'all books sort' do
      47. 1 context 'when sort by title A to Z' do
      48. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      49. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:books) do ======= RSpec.configure do |config| >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:books) do >>>>>>> 5b7749a (Fix)
      50. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) create(:book, title: titles.first) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> d0dc1f1 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= create(:book, title: titles.first) >>>>>>> 5b7749a (Fix)
      51. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) create(:book, title: titles.second) ======= config.use_transactional_fixtures = true >>>>>>> d0dc1f1 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= create(:book, title: titles.second) >>>>>>> 5b7749a (Fix)
      52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      53. end
      54. 2 let(:result) { titles.second }
      55. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
      56. <<<<<<< HEAD =======
      57. >>>>>>> d0dc1f1 (Featire specs) =======
      58. >>>>>>> 752f0c0 (Featire specs) =======
      59. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      60. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      61. >>>>>>> 08edf50 (Featire specs) =======
      62. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      63. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) include_examples 'sort test' ======= config.infer_spec_type_from_file_location! >>>>>>> d0dc1f1 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= include_examples 'sort test' >>>>>>> 5b7749a (Fix)
      64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      65. end
      66. <<<<<<< HEAD =======
      67. >>>>>>> d0dc1f1 (Featire specs) =======
      68. >>>>>>> 752f0c0 (Featire specs) =======
      69. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      70. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      71. >>>>>>> 08edf50 (Featire specs) =======
      72. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      73. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) context 'when sort title Z to A' do ======= config.filter_rails_from_backtrace! >>>>>>> d0dc1f1 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= context 'when sort title Z to A' do >>>>>>> 5b7749a (Fix)
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      75. 1 let(:books) do
      76. 1 create(:book, title: titles.first)
      77. 1 create(:book, title: titles.second)
      78. end
      79. 2 let(:result) { titles.first }
      80. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
      81. 1 include_examples 'sort test'
      82. end
      83. 1 context 'when sort by price High to Low' do
      84. 1 let(:books) do
      85. 1 create(:book, price_cents: 75)
      86. 1 create(:book, price_cents: 23)
      87. end
      88. 2 let(:result) { 75 }
      89. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
      90. 1 include_examples 'sort test'
      91. end
      92. 1 context 'when sort price Low to High' do
      93. 1 let(:books) do
      94. 1 create(:book, price_cents: 75)
      95. 1 create(:book, price_cents: 23)
      96. end
      97. 2 let(:result) { 23 }
      98. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
      99. 1 include_examples 'sort test'
      100. end
      101. 1 context 'when sort by Newest' do
      102. 1 let(:books) do
      103. 1 create(:book, created_at: books_dates.first)
      104. 1 create(:book, created_at: books_dates.second)
      105. end
      106. 2 let(:result) { books_dates.first }
      107. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
      108. 1 include_examples 'sort test'
      109. end
      110. end
      111. <<<<<<< HEAD =======
      112. >>>>>>> d0dc1f1 (Featire specs) =======
      113. >>>>>>> 752f0c0 (Featire specs) =======
      114. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      115. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      116. >>>>>>> 08edf50 (Featire specs) =======
      117. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      118. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) end

      spec/support/configs/capybara.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= 36.84% >>>>>>> bd8bda4 (Manifest_cache true) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) ======= 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 36.84% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> 5b7749a (Fix) lines covered

      19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
          
        <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true)
      1. 1 =======
      2. >>>>>>> d0dc1f1 (Featire specs) =======
      3. >>>>>>> 752f0c0 (Featire specs) =======
      4. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      5. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      6. >>>>>>> 7a02bbe (Featire specs) =======
      7. >>>>>>> 4552227 (Featire specs) =======
      8. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) RSpec.describe 'Author' do ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
      10. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      11. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) include_context 'with api request authentication helper methods' ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) Capybara.configure do |config| >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
      13. =======
      14. >>>>>>> bd8bda4 (Manifest_cache true) =======
      15. >>>>>>> 36356d3 (Featire specs) =======
      16. >>>>>>> 64dceec (Manifest_cache true) 1 config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 4552227 (Featire specs)
      17. <<<<<<< HEAD <<<<<<< HEAD
      18. =======
      19. >>>>>>> bd8bda4 (Manifest_cache true) =======
      20. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request global before and after hooks'
      21. ======= >>>>>>> 6da9530 (Featire specs)
      22. 2 let(:first_name) { FFaker::Name.first_name }
      23. 2 let(:last_name) { FFaker::Name.last_name }
      24. 2 let(:new_name) { FFaker::Name.first_name }
      25. 2 let(:old_name) { author.first_name }
      26. 4 let(:author) { create(:author) }
      27. 1 before do
      28. 4 sign_in(create(:admin_user), :admin_user)
      29. end
      30. 1 it 'can create an author' do
      31. 1 visit 'admin/authors'
      32. 1 click_link('New Author')
      33. 1 fill_in 'author[first_name]', with: first_name
      34. 1 fill_in 'author[last_name]', with: last_name
      35. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      36. end
      37. 1 it 'can delete an author' do
      38. 1 author
      39. 1 visit 'admin/authors'
      40. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      41. end
      42. 1 it 'can view an author' do
      43. 1 author
      44. 1 visit 'admin/authors'
      45. 1 click_link('View')
      46. 1 expect(page).to have_content(author.first_name)
      47. end
      48. 1 it 'can edit an author' do
      49. 1 author
      50. 1 visit 'admin/authors'
      51. 1 click_link('Edit')
      52. 1 fill_in 'author[first_name]', with: new_name
      53. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      54. end
      55. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD
      5. 7 =======
      6. =======
      7. >>>>>>> d0dc1f1 (Featire specs) =======
      8. >>>>>>> 752f0c0 (Featire specs) 5 >>>>>>> 93bdda9 (Featire specs) =======
      9. 7 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:book) { create(:book) } <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) let(:category_one) { FactoryBot.create(:category) }
      10. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { create(:book) } >>>>>>> 872e675 (Fix) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      11. 1 let(:params) do
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      13. 1 =======
      14. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      15. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      16. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      17. 4 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      18. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      19. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      20. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      21. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      22. 4 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      23. 4 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      24. 1 >>>>>>> 1d59aaa (Fix) { title: FFaker::Book.title,
      25. description: FFaker::Book.description,
      26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= price_cents: FFaker::Number.rand(1..100), >>>>>>> 1d59aaa (Fix)
      27. dimensions: FFaker::Book.cover,
      28. year_of_publication: FFaker::Number.rand(1900..2022),
      29. materials: 'Soft cover',
      30. quantity: FFaker::Number.rand(2..5) }
      31. end
      32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      33. 1 before do
      34. 6 sign_in(create(:admin_user), :admin_user)
      35. 6 book
      36. 6 visit 'admin/books'
      37. end
      38. 1 it 'can create an book' do
      39. 1 click_link('New Book')
      40. 1 fill_in 'book[title]', with: params[:title]
      41. 1 fill_in 'book[description]', with: params[:description]
      42. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
      43. 1 fill_in 'book[price_cents]', with: params[:price_cents]
      44. 1 fill_in 'book[materials]', with: params[:materials]
      45. 1 fill_in 'book[dimensions]', with: params[:dimensions]
      46. 1 fill_in 'book[quantity]', with: params[:quantity]
      47. 1 click_button('Create Book')
      48. 1 expect(page).to have_content(params[:title])
      49. end
      50. 1 it 'can delete an book' do
      51. 1 click_link('Delete')
      52. 1 expect(page).not_to have_content(book.title)
      53. end
      54. 1 it 'can view an book' do
      55. 1 click_link('View')
      56. 1 expect(page).to have_content(book.title)
      57. end
      58. 1 it 'can edit an book' do
      59. 1 click_link('Edit')
      60. 1 fill_in 'book[title]', with: 'New title'
      61. 1 click_button('Update Book')
      62. 1 expect(page).to have_content('New title')
      63. end
      64. 1 context 'when image' do
      65. 1 before do
      66. 2 click_link('Edit')
      67. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
      68. 2 click_on 'Update Book'
      69. end
      70. 1 it 'can add images to book' do
      71. 1 expect(book.reload.images.count).to eq(1)
      72. end
      73. 1 it 'can delete images from book' do
      74. 1 click_link('Edit')
      75. 1 click_link('Delete')
      76. 1 expect(book.reload.images.count).to eq(0)
      77. end
      78. end
      79. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) =======
      11. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      12. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      13. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      14. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      16. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      18. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      19. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 1d59aaa (Fix)
      20. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can create an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= describe '#show book' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= it 'can create an category' do >>>>>>> 1d59aaa (Fix)
      21. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('New Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= it 'show books info' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= click_link('New Category') >>>>>>> 1d59aaa (Fix)
      22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      23. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      24. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      25. 1 visit "books/#{book.id}"
      26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      27. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      28. >>>>>>> 1d59aaa (Fix)
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      32. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      33. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      34. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      35. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      40. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      41. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      42. >>>>>>> 1d59aaa (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD fill_in 'category[name]', with: category_name >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= fill_in 'category[name]', with: category_name >>>>>>> 1d59aaa (Fix)
      43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      44. =======
      45. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      46. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      47. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      48. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      49. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      50. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      51. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      52. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      53. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      54. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      55. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      56. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      57. 1 click_button('Create Category') <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      58. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(category_name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(category_name) >>>>>>> 1d59aaa (Fix)
      59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      60. =======
      61. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      62. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      63. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      64. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      65. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      66. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      67. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      68. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      69. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      70. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      71. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 1d59aaa (Fix)
      72. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can delete an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= it 'can delete an category' do >>>>>>> 1d59aaa (Fix)
      73. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      74. 1 click_link('Delete')
      75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      76. >>>>>>> d0dc1f1 (Featire specs) =======
      77. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      78. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      79. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      80. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      81. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      82. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      83. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      84. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      85. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      86. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      87. =======
      88. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      89. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      90. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      91. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      92. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      93. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      94. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      95. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      96. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      97. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      98. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      99. >>>>>>> 1d59aaa (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) expect(page).to have_content('Catalog')
      100. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).not_to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content(category.name) >>>>>>> 1d59aaa (Fix)
      101. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 1d59aaa (Fix)
      102. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      103. =======
      104. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      105. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      106. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      107. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      108. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      109. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      110. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      111. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      112. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      113. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      114. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      115. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can view an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= it 'show read more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= it 'can view an category' do >>>>>>> 1d59aaa (Fix)
      116. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('View') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= click_link('View') >>>>>>> 1d59aaa (Fix)
      117. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(category.name) >>>>>>> 1d59aaa (Fix)
      118. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 1d59aaa (Fix)
      119. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can edit an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= it 'can edit an category' do >>>>>>> 1d59aaa (Fix)
      120. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('Edit') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= click_link('Edit') >>>>>>> 1d59aaa (Fix)
      121. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= fill_in 'category[name]', with: 'New Genre' >>>>>>> 1d59aaa (Fix)
      122. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_button('Update Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= click_button('Update Category') >>>>>>> 1d59aaa (Fix)
      123. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      125. 1 =======
      126. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      127. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      128. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      129. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      130. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      131. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      132. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      133. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      134. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      135. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      136. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content('New Genre') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('New Genre') >>>>>>> 1d59aaa (Fix)
      137. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) end
      138. end

      spec/feature/billing_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Billing', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      6. 2 let(:user) { create(:user) }
      7. 1 let(:attributes_for) { attributes_for(:billing) }
      8. 1 describe '#fill_in', js: true do
      9. 1 it 'fill in billing' do
      10. 1 sign_in(user)
      11. 1 visit edit_user_path(user.id)
      12. 1 within('div#billing.col-md-5.mb-40') do
      13. 1 find_all('div', class: 'form-group')[0] do
      14. fill_in :first_name, with: attributes_for[:first_name]
      15. end
      16. 1 find_all('div', class: 'form-group')[1] do
      17. fill_in :last_name, with: attributes_for[:last_name]
      18. end
      19. 1 find_all('div', class: 'form-group')[2] do
      20. fill_in :address, with: attributes_for[:address]
      21. end
      22. 1 find_all('div', class: 'form-group')[3] do
      23. fill_in :city, with: attributes_for[:city]
      24. end
      25. 1 find_all('div', class: 'form-group')[4] do
      26. fill_in :zip, with: attributes_for[:zip]
      27. end
      28. 1 find_all('div', class: 'form-group')[5] do
      29. fill_in :country, with: attributes_for[:country]
      30. end
      31. 1 find_all('div', class: 'form-group')[6] do
      32. fill_in :phone, with: attributes_for[:phone]
      33. end
      34. 1 click_on I18n.t('settings.save')
      35. end
      36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      37. end
      38. end
      39. end

      spec/feature/book_spec.rb

      100.0% lines covered

      104 relevant lines. 104 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book', type: :feature do
      2. 5 let(:category_one) { create(:category) }
      3. 3 let(:category_two) { create(:category) }
      4. 1 let(:params) do
      5. 4 { title: FFaker::Book.title,
      6. description: FFaker::Book.description,
      7. price_cents: FFaker::Number.rand(1..100),
      8. dimensions: FFaker::Book.cover,
      9. year_of_publication: FFaker::Number.rand(1900..2022),
      10. materials: 'Soft cover',
      11. quantity: FFaker::Number.rand(2..5) }
      12. end
      13. 7 let(:book) { create(:book).decorate }
      14. 1 describe '#show book' do
      15. 1 it 'show books info' do
      16. 1 visit "books/#{book.id}"
      17. 1 expect(page).to have_content(book.title)
      18. end
      19. 1 it 'clicked Beck to results' do
      20. 1 visit "books/#{book.id}"
      21. 1 find('a', class: 'general-back-link').click
      22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
      23. end
      24. 1 context 'when test read more' do
      25. 1 it 'show read more' do
      26. 1 visit "books/#{book.id}"
      27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
      28. end
      29. 1 it 'clicked read more', js: true do
      30. 1 visit "books/#{book.id}"
      31. 1 click_link I18n.t('book_page.read_more')
      32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
      33. end
      34. end
      35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      36. >>>>>>> d0dc1f1 (Featire specs) =======
      37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      38. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      39. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      40. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      41. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      42. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      43. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      44. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      45. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) 1 context 'when quantity changes', js: true do
      46. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      47. =======
      48. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      49. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      50. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      51. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      52. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      55. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      56. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      57. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      58. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      59. >>>>>>> 1d59aaa (Fix) 1 before do
      60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      61. 2 visit "books/#{book.id}"
      62. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      63. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD find('a', class: 'inc').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= find('a', class: 'inc').click >>>>>>> 1d59aaa (Fix)
      64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) end
      65. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      66. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      67. 1 =======
      68. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      69. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      70. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      71. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      72. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
      73. 2 >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) =======
      74. 1 >>>>>>> 1d59aaa (Fix) it 'increase quantity' do
      75. <<<<<<< HEAD
      76. end
      77. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'increase quantity' do ======= it 'increase quantity' do >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'increase quantity' do >>>>>>> 872e675 (Fix) ======= it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs)
      78. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      79. 1 expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
      80. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      81. >>>>>>> d0dc1f1 (Featire specs) =======
      82. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      83. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      84. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      85. >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) end
      86. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs)
      87. =======
      88. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      89. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      90. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      91. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      92. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      93. >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) =======
      94. >>>>>>> 1d59aaa (Fix)
      95. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs)
      96. =======
      97. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      98. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      99. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      100. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      101. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      102. >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) =======
      103. >>>>>>> 1d59aaa (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'decrease quantity' do >>>>>>> 872e675 (Fix) ======= it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) ======= it 'decrease quantity' do >>>>>>> 1d59aaa (Fix)
      104. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs)
      105. =======
      106. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      107. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      108. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      109. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      110. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      111. >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) =======
      112. >>>>>>> 1d59aaa (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dec').click ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price * 2}")
      113. end
      114. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD find('a', class: 'dec').click >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dec').click >>>>>>> 1d59aaa (Fix)
      115. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) it 'decrease quantity', js: true do ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= it 'decrease quantity', js: true do >>>>>>> 4552227 (Featire specs) ======= it 'decrease quantity' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)
      116. 1 find('a', class: 'dec').click
      117. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) expect(page).to have_content("€#{book.price}")
      118. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      119. end
      120. end
      121. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      122. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 1d59aaa (Fix)
      123. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) end
      124. end
      125. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      126. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      127. 1 describe '#catalog' do
      128. 1 describe 'filter by category' do
      129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      130. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) describe '#catalog' do
      131. 1 describe 'filter by category' do
      132. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) before do
      133. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      134. =======
      135. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      136. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      137. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      138. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      139. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      140. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      141. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      142. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      143. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      144. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      145. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      146. >>>>>>> 1d59aaa (Fix) 2 category_one.books.create(params)
      147. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      148. =======
      149. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      150. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      151. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      152. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      153. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      154. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      155. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      156. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      157. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      158. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      159. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      160. >>>>>>> 1d59aaa (Fix) 2 visit books_path
      161. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      162. =======
      163. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      164. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      165. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      166. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      167. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      168. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      169. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      170. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      171. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      172. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      173. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      174. >>>>>>> 1d59aaa (Fix) end
      175. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      176. =======
      177. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      178. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      179. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      180. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      181. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      182. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      183. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      184. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      185. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      186. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      187. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      188. >>>>>>> 1d59aaa (Fix)
      189. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      190. =======
      191. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      192. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      193. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      194. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      195. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      196. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      197. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      198. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      199. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      200. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      201. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      202. >>>>>>> 1d59aaa (Fix) 1 after do
      203. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      204. =======
      205. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      206. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      207. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      208. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      209. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      210. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      211. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      212. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      213. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      214. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      215. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      216. >>>>>>> 1d59aaa (Fix) 2 category_one.destroy
      217. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      218. =======
      219. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      220. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      221. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      222. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      223. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      224. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      225. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      226. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      227. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      228. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      229. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      230. >>>>>>> 1d59aaa (Fix) end
      231. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      232. =======
      233. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      234. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      235. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      236. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      237. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      238. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      239. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      240. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      241. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      242. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      243. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      244. >>>>>>> 1d59aaa (Fix)
      245. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      246. =======
      247. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      248. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      249. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      250. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      251. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      252. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      253. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      254. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      255. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      256. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      257. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      258. >>>>>>> 1d59aaa (Fix) 1 it 'show book count for category' do
      259. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      260. =======
      261. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      262. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      263. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      264. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      265. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      266. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      267. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      268. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      269. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      270. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      271. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      272. >>>>>>> 1d59aaa (Fix) 1 expect(page).to have_content(category_one.books.size)
      273. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      274. =======
      275. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      276. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      277. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      278. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      279. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      280. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      281. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      282. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      283. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      284. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      285. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      286. >>>>>>> 1d59aaa (Fix) end
      287. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      288. =======
      289. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      290. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      291. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      292. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      293. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      294. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      295. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      296. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      297. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      298. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      299. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      300. >>>>>>> 1d59aaa (Fix)
      301. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      302. 1 it 'filter book by category' do
      303. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      304. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      305. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) it 'filter book by category' do
      306. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      307. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) click_on category_one.name
      308. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      309. =======
      310. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      311. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      312. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      313. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      314. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      315. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      316. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      317. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      318. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      319. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      320. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      321. >>>>>>> 1d59aaa (Fix) end
      322. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      323. =======
      324. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      325. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      326. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      327. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      328. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      329. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      330. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      331. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      332. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      333. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      334. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      335. >>>>>>> 1d59aaa (Fix)
      336. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      337. =======
      338. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      339. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      340. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      341. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      342. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      343. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      344. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      345. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      346. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      347. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      348. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      349. >>>>>>> 1d59aaa (Fix) 1 expect(page).to have_content(category_one.books.first.title)
      350. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      351. =======
      352. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      353. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      354. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      355. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      356. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      357. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      358. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      359. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      360. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      361. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      362. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      363. >>>>>>> 1d59aaa (Fix) end
      364. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      365. =======
      366. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      367. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      368. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      369. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      370. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      371. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      372. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      373. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      374. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      375. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      376. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      377. >>>>>>> 1d59aaa (Fix) end
      378. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      379. =======
      380. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      381. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      382. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      383. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      384. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      385. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      386. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      387. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      388. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      389. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      390. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      391. >>>>>>> 1d59aaa (Fix)
      392. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      393. =======
      394. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      395. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      396. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      397. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      398. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      399. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      400. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      401. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      402. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      403. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      404. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      405. >>>>>>> 1d59aaa (Fix) 1 describe 'filter by all books' do
      406. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      407. =======
      408. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      409. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      410. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      411. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      412. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      413. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      414. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      415. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      416. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      417. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      418. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      419. >>>>>>> 1d59aaa (Fix) 1 before do
      420. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      421. =======
      422. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      423. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      424. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      425. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      426. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      427. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      428. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      429. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      430. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      431. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      432. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      433. >>>>>>> 1d59aaa (Fix) 2 category_one.books.create(params)
      434. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      435. 2 category_two.books.create(params)
      436. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      437. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 1d59aaa (Fix)
      438. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_on I18n.t('catalog_page.all') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= click_on I18n.t('catalog_page.all') >>>>>>> 1d59aaa (Fix)
      439. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      440. 2 click_on 'All'
      441. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) end
      442. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      443. =======
      444. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      445. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      446. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      447. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      448. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      449. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      450. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      451. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      452. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      453. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      454. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      455. >>>>>>> 1d59aaa (Fix)
      456. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      457. =======
      458. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      459. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      460. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      461. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      462. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      463. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      464. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      465. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      466. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      467. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      468. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      469. >>>>>>> 1d59aaa (Fix) 1 after do
      470. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      471. =======
      472. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      473. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      474. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      475. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      476. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      477. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      478. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      479. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      480. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      481. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      482. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      483. >>>>>>> 1d59aaa (Fix) 2 category_one.destroy
      484. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      485. =======
      486. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      487. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      488. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      489. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      490. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      491. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      492. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      493. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      494. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      495. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      496. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      497. >>>>>>> 1d59aaa (Fix) 2 category_two.destroy
      498. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      499. =======
      500. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      501. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      502. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      503. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      504. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      505. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      506. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      507. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      508. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      509. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      510. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      511. >>>>>>> 1d59aaa (Fix) end
      512. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      513. =======
      514. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      515. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      516. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      517. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      518. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      519. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      520. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      521. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      522. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      523. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      524. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      525. >>>>>>> 1d59aaa (Fix)
      526. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      527. =======
      528. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      529. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      530. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      531. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      532. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      533. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      534. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      535. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      536. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      537. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      538. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      539. >>>>>>> 1d59aaa (Fix) 1 it 'shown books for first category' do
      540. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      541. =======
      542. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      543. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      544. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      545. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      546. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      547. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      548. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      549. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      550. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      551. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      552. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      553. >>>>>>> 1d59aaa (Fix) 1 expect(page).to have_content(category_one.books.first.title)
      554. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      555. =======
      556. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      557. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      558. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      559. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      560. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      561. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      562. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      563. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      564. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      565. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      566. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      567. >>>>>>> 1d59aaa (Fix) end
      568. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      569. =======
      570. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      571. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      572. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      573. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      574. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      575. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      576. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      577. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      578. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      579. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      580. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      581. >>>>>>> 1d59aaa (Fix)
      582. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      583. =======
      584. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      585. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      586. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      587. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      588. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      589. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      590. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      591. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      592. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      593. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      594. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      595. >>>>>>> 1d59aaa (Fix) 1 it 'shown books for second category' do
      596. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      597. =======
      598. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      599. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      600. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      601. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      602. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      603. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      604. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      605. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      606. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      607. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      608. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      609. >>>>>>> 1d59aaa (Fix) 1 expect(page).to have_content(category_two.books.first.title)
      610. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      611. end
      612. end
      613. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      614. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 1d59aaa (Fix)
      615. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) end
      616. end
      617. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      618. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      619. =======
      620. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      621. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      622. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      623. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      624. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      625. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      626. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      627. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      628. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      629. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      630. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      631. >>>>>>> 1d59aaa (Fix) 1 describe 'load_more' do
      632. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      633. =======
      634. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      635. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      636. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      637. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      638. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      639. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      640. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      641. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      642. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      643. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      644. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      645. >>>>>>> 1d59aaa (Fix) 1 before do
      646. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      647. =======
      648. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      649. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      650. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      651. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      652. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      653. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      654. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      655. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      656. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      657. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      658. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      659. >>>>>>> 1d59aaa (Fix) 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) 24.times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= 24.times do >>>>>>> 872e675 (Fix) ======= 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)
      660. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      661. =======
      662. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      663. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      664. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      665. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      666. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      667. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      668. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      669. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      670. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      671. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      672. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      673. >>>>>>> 1d59aaa (Fix) 72 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) books << create(:book)
      674. end
      675. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      676. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      677. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      678. 4 =======
      679. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      680. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      681. 4 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      682. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      683. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      684. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      685. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      686. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      687. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      688. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      689. 4 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD let(:books) { [] } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 1d59aaa (Fix)
      690. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      691. 1 =======
      692. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      693. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      694. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      695. 4 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      696. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      697. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      698. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      699. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      700. 4 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      701. 4 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      702. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'show books without view more button' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= it 'show books without view more button' do >>>>>>> 1d59aaa (Fix)
      703. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      704. 1 visit books_path
      705. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      706. >>>>>>> d0dc1f1 (Featire specs) =======
      707. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      708. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      709. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      710. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      711. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      712. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      713. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      714. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      715. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      716. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      717. 1 it 'show books without view more button' do
      718. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      719. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 1d59aaa (Fix)
      720. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 1d59aaa (Fix)
      721. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      722. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
      723. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) end
      724. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      725. =======
      726. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      727. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      728. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      729. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      730. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      731. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      732. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      733. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      734. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      735. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      736. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      737. >>>>>>> 1d59aaa (Fix)
      738. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      739. 1 context 'when view more' do
      740. 1 it 'show books with view more button' do
      741. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      742. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= context 'when view more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 1d59aaa (Fix)
      743. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      744. =======
      745. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      746. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      747. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      748. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      749. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      750. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      751. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      752. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      753. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      754. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      755. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      756. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= expect(page).to have_css('a', class: 'view_more') >>>>>>> 1d59aaa (Fix)
      757. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      758. 1 expect(page).to have_css('a', class: 'view_more')
      759. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) end
      760. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      761. =======
      762. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      763. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      764. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      765. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      766. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      767. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      768. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      769. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      770. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      771. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      772. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      773. >>>>>>> 1d59aaa (Fix)
      774. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      775. =======
      776. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      777. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      778. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      779. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      780. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      781. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      782. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      783. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      784. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      785. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      786. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      787. >>>>>>> 1d59aaa (Fix) 1 it 'show loaded books', js: true do
      788. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      789. 1 visit books_path
      790. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      791. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD find('a', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= find('a', class: 'view_more').click >>>>>>> 1d59aaa (Fix)
      792. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(books.last.title) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 1d59aaa (Fix)
      793. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 1d59aaa (Fix)
      794. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      795. =======
      796. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      797. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      798. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      799. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      800. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      801. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      802. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      803. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      804. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      805. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      806. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 1d59aaa (Fix)
      807. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 1d59aaa (Fix)
      808. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) end
      809. end
      810. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      811. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      812. =======
      813. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      814. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      815. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      816. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      817. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      818. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      819. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      820. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      821. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      822. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      823. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      824. >>>>>>> 1d59aaa (Fix) 1 describe 'sort' do
      825. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      826. =======
      827. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      828. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      829. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      830. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      831. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      832. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      833. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      834. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      835. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      836. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      837. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      838. >>>>>>> 1d59aaa (Fix) 1 shared_examples 'sort test' do
      839. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      840. =======
      841. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      842. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      843. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      844. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      845. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      846. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      847. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      848. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      849. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      850. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      851. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      852. >>>>>>> 1d59aaa (Fix) 5 it 'sort books' do
      853. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      854. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
      855. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
      856. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      857. 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD create(:book, title: 'Anna', price_cents: 23, >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= create(:book, title: 'Anna', price_cents: 23, >>>>>>> 1d59aaa (Fix)
      858. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 872e675 (Fix) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)
      859. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      860. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      861. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      862. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
      863. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      864. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      865. >>>>>>> 1d59aaa (Fix)
      866. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      867. =======
      868. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      869. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      870. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      871. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      872. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      873. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      874. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      875. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      876. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      877. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      878. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      879. >>>>>>> 1d59aaa (Fix) 5 visit books_path
      880. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      881. =======
      882. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      883. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      884. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      885. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      886. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      887. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      888. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      889. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      890. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      891. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      892. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      893. >>>>>>> 1d59aaa (Fix)
      894. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      895. =======
      896. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      897. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      898. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      899. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      900. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      901. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      902. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      903. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      904. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      905. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      906. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      907. >>>>>>> 1d59aaa (Fix) 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
      908. id: 'menu').click <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
      909. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
      910. 5 click_link button
      911. end
      912. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
      913. end
      914. end
      915. 1 context 'when sort by title A to Z' do
      916. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 1d59aaa (Fix)
      917. 2 let(:book_title) { 'Anna' }
      918. 1 include_examples 'sort test'
      919. end
      920. 1 context 'when sort by title Z to A' do
      921. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 1d59aaa (Fix)
      922. 2 let(:book_title) { 'Zimbabwe' }
      923. 1 include_examples 'sort test'
      924. end
      925. 1 context 'when sort by price High to Low' do
      926. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 1d59aaa (Fix)
      927. 2 let(:book_title) { 'Zimbabwe' }
      928. 1 include_examples 'sort test'
      929. end
      930. 1 context 'when sort by price Low to High' do
      931. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 1d59aaa (Fix)
      932. 2 let(:book_title) { 'Anna' }
      933. 1 include_examples 'sort test'
      934. end
      935. 1 context 'when sort by newest' do
      936. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 1d59aaa (Fix)
      937. 2 let(:book_title) { 'Zimbabwe' }
      938. 1 include_examples 'sort test'
      939. end
      940. end
      941. end

      spec/feature/cart_spec.rb

      96.55% lines covered

      29 relevant lines. 28 lines covered and 1 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe 'Cart', type: :feature, js: true do
      3. 5 let(:book) { FactoryBot.create(:book) }
      4. 1 before do
      5. 4 book
      6. 4 visit book_path(book.id)
      7. 4 click_button I18n.t('book_page.add_to_card')
      8. end
      9. 1 describe '#add_book_to_order' do
      10. 1 it 'add book to order' do
      11. 1 within('span', class: 'shop-icon') do
      12. 1 expect(page).to have_content(1)
      13. end
      14. end
      15. end
      16. 1 describe '#quantity_change' do
      17. 1 it 'book quantity inc' do
      18. 1 visit orders_path
      19. 1 within("a#inc#{book.id}.input-link") do
      20. 1 find('i.fa.fa-plus.line-heaght-40').click
      21. end
      22. 1 sleep(2)
      23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
      24. end
      25. 1 it 'book quantity dec' do
      26. 1 visit orders_path
      27. 1 within("a#dec#{book.id}.input-link") do
      28. 1 find('i.fa.fa-minus.line-heaght-40').click
      29. end
      30. 1 sleep(2)
      31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
      32. end
      33. end
      34. 1 describe '#remove_book_from_cart' do
      35. 1 it 'book quantity change' do
      36. 1 visit orders_path
      37. 1 find('button.close.general-cart-close').click
      38. expect(page).to have_content(I18n.t('order.messages.delete'))
      39. end
      40. end
      41. end

      spec/feature/coupon_spec.rb

      100.0% lines covered

      30 relevant lines. 30 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
      4. 1 include_context 'with api request authentication helper methods'
      5. 1 include_context 'with api request global before and after hooks'
      6. 5 let(:user) { FactoryBot.create(:user) }
      7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
      8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
      9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
      10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
      11. 1 before do
      12. 4 sign_in(user)
      13. 4 order
      14. 4 order_book
      15. 4 visit orders_path
      16. end
      17. 1 describe '#valid coupon' do
      18. 1 before do
      19. 3 fill_in 'input', with: coupon.code
      20. 3 click_button I18n.t('order.apply')
      21. end
      22. 1 it 'sub price' do
      23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
      24. end
      25. 1 it 'use coupon' do
      26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
      27. end
      28. 1 it 'count price with coupon' do
      29. 1 expect(page).to have_content('Order Total: € 10.49')
      30. end
      31. end
      32. 1 describe '#invalid coupon' do
      33. 1 it 'show error message' do
      34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
      35. 1 click_button I18n.t('order.apply')
      36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
      37. end
      38. end
      39. end

      spec/feature/home_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) 49 relevant lines. 49 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Home', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 1 describe 'Get Started' do
      5. 1 it 'on click move to catalog page' do
      6. 1 visit root_path
      7. 1 click_on 'Get Started'
      8. 1 expect(page).to have_content('Catalog')
      9. end
      10. end
      11. 1 describe 'navbar' do
      12. 2 let(:books_category) { create(:books_category) }
      13. 1 it 'on click home move to root-path' do
      14. 1 visit books_path
      15. 1 find('a', id: 'root').click
      16. 1 expect(page).to have_content('Get Started')
      17. end
      18. 1 it 'on click category name move to root-path with books that belong to this category' do
      19. 1 books_category
      20. 1 visit root_path
      21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      22. 1 within('ul', id: 'nav') do
      23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      24. end
      25. 1 expect(page).to have_content(books_category.category.books.first.title)
      26. end
      27. 1 context 'when guest' do
      28. 1 it 'on click login go to login page' do
      29. 1 visit root_path
      30. 1 within 'div', class: 'visible-xs' do
      31. 1 click_link I18n.t('header.log_in')
      32. end
      33. 1 expect(page).to have_content(I18n.t('header.log_in'))
      34. end
      35. 1 it 'on click sing up go to sing up page' do
      36. 1 visit root_path
      37. 1 within 'div', class: 'visible-xs' do
      38. 1 click_link I18n.t('header.sing_up')
      39. end
      40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
      41. end
      42. end
      43. 1 context 'when user', js: true do
      44. 4 let(:user) { create(:user) }
      45. 1 before do
      46. 3 sign_in(user)
      47. end
      48. 1 it 'on click account show settings' do
      49. 1 visit root_path
      50. 1 click_on I18n.t('header.account')
      51. 1 expect(page).to have_content(I18n.t('header.settings'))
      52. end
      53. 1 it 'on click account show log_out' do
      54. 1 visit root_path
      55. 1 click_on I18n.t('header.account')
      56. 1 expect(page).to have_content(I18n.t('header.log_out'))
      57. end
      58. 1 it 'log_out' do
      59. 1 visit root_path
      60. 1 click_on I18n.t('header.account')
      61. 1 click_on(I18n.t('header.log_out'), match: :first)
      62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
      63. end
      64. end
      65. end
      66. end

      spec/feature/login_spec.rb

      >>>>>>> a5d032d (Fix) 100.0% lines covered

      <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Login', type: :feature do
      2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#login' do
      4. 1 before do
      5. 2 visit new_user_session_path
      6. end
      7. 1 context 'when successfully login' do
      8. 1 it 'login' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: user_second.email
      11. 1 fill_in 'user_password', with: user_second.password
      12. 1 click_on I18n.t('header.log_in')
      13. end
      14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      15. end
      16. end
      17. 1 context 'when unsuccessfully login' do
      18. 1 it 'didn`t login' do
      19. 1 within 'form', class: 'new_user', id: 'new_user' do
      20. 1 fill_in 'user_email', with: user_second.email
      21. 1 fill_in 'user_password', with: 'wrong_password'
      22. 1 click_on I18n.t('header.log_in')
      23. end
      24. 1 expect(page).to have_text 'Invalid Email or password.'
      25. end
      26. end
      27. end
      28. end

      spec/feature/new_password_spec.rb

      100.0% lines covered

      13 relevant lines. 13 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'New Password', type: :feature do
      4. 3 let(:user) { FactoryBot.create(:user) }
      5. 1 describe '#new_password' do
      6. 1 it 'change password' do
      7. 1 user.reset_password('newPassword', 'newPassword')
      8. 1 expect(user.password).to eq('newPassword')
      9. end
      10. 1 it 'not validate password' do
      11. 1 visit new_user_password_path
      12. 1 fill_in 'email', with: user.email
      13. 1 click_on I18n.t('login.send_instructions')
      14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
      15. end
      16. end
      17. end

      spec/feature/registration_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Registration', type: :feature do
      2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#sing_up' do
      4. 1 before do
      5. 3 visit new_user_registration_path
      6. end
      7. 1 context 'when successfully sing_up' do
      8. 1 it 'sing_up users' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
      11. 1 fill_in 'user_password', with: user.password
      12. 1 fill_in 'user_password_confirmation', with: user.password
      13. 1 click_on I18n.t('header.sing_up')
      14. end
      15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      16. end
      17. end
      18. 1 context 'when users is already exits' do
      19. 1 it 'sing_up users' do
      20. 1 within 'form', class: 'new_user', id: 'new_user' do
      21. 1 fill_in 'user_email', with: user.email
      22. 1 fill_in 'user_password', with: user.password
      23. 1 fill_in 'user_password_confirmation', with: user.password
      24. 1 click_on I18n.t('header.sing_up')
      25. end
      26. 1 expect(page).to have_text('Email has already been taken')
      27. end
      28. end
      29. 1 context 'when unsuccessfully sing_up' do
      30. 1 it 'didn`t sing_up' do
      31. 1 within 'form', class: 'new_user', id: 'new_user' do
      32. 1 fill_in 'user_email', with: FFaker::Internet.email
      33. 1 fill_in 'user_password', with: 'password'
      34. 1 fill_in 'user_password_confirmation', with: 'wrong'
      35. 1 click_on I18n.t('header.sing_up')
      36. end
      37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      38. end
      39. end
      40. end
      41. end

      spec/feature/review_spec.rb

      100.0% lines covered

      28 relevant lines. 28 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Review', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 3 let(:user) { create(:user).decorate }
      5. 3 let(:book) { create(:book).decorate }
      6. 1 before do
      7. 2 sign_in(user)
      8. 2 visit book_path(book)
      9. end
      10. 1 shared_examples 'review' do
      11. 2 it 'review' do
      12. 2 find('i', id: rating).click
      13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
      14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
      15. 2 click_on I18n.t('review.post')
      16. 2 expect(page).to have_content(result)
      17. end
      18. end
      19. 1 describe '#post review', js: true do
      20. 1 context 'when review posted' do
      21. 2 let(:rating) { "star#{rand(1..5)}" }
      22. 2 let(:title_words) { 3 }
      23. 2 let(:body_words) { 5 }
      24. 2 let(:result) { user.name_or_email }
      25. 1 include_examples 'review'
      26. end
      27. 1 context 'when review not been posted' do
      28. 2 let(:rating) { "star#{rand(1..5)}" }
      29. 2 let(:title_words) { 80 }
      30. 2 let(:body_words) { 30 }
      31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      32. 1 include_examples 'review'
      33. end
      34. end
      35. end

      spec/feature/settings_spec.rb

      100.0% lines covered

      34 relevant lines. 34 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Settings', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 4 let(:user) { create(:user) }
      5. 1 before do
      6. 3 sign_in(user)
      7. 3 visit edit_user_path(user.id)
      8. 3 click_link I18n.t('settings.privacy')
      9. end
      10. 1 describe '#email_change' do
      11. 1 it 'change email' do
      12. 1 within('div', id: 'email') do
      13. 1 fill_in :email, with: FFaker::Internet.email
      14. 1 click_on I18n.t('settings.save')
      15. end
      16. 1 user.confirm
      17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      18. end
      19. end
      20. 1 describe '#password_change' do
      21. 1 context 'when error' do
      22. 1 it 'didnt change password' do
      23. 1 within('div', id: 'password') do
      24. 1 fill_in :current_password, with: user.password
      25. 1 fill_in :password, with: 'newPassword'
      26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
      27. 1 click_on I18n.t('settings.save')
      28. end
      29. 1 user.confirm
      30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
      31. end
      32. end
      33. 1 context 'when successful' do
      34. 1 it 'didnt change password' do
      35. 1 within('div', id: 'password') do
      36. 1 fill_in :current_password, with: user.password
      37. 1 fill_in :password, with: 'newPassword'
      38. 1 fill_in :password_confirmation, with: 'newPassword'
      39. 1 click_on I18n.t('settings.save')
      40. end
      41. 1 user.confirm
      42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
      43. end
      44. end
      45. end
      46. end

      spec/feature/shipping_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Shipping', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:user) { FactoryBot.create(:user) }
      5. 1 let(:attributes_for) { attributes_for(:shipping) }
      6. 1 describe '#fill_in', js: true do
      7. 1 it 'fill in shipping' do
      8. 1 sign_in(user)
      9. 1 visit edit_user_path(user.id)
      10. 1 within('div#shipping.col-md-5.mb-40') do
      11. 1 find_all('div', class: 'form-group')[0] do
      12. fill_in :first_name, with: attributes_for[:first_name]
      13. end
      14. 1 find_all('div', class: 'form-group')[1] do
      15. fill_in :last_name, with: attributes_for[:last_name]
      16. end
      17. 1 find_all('div', class: 'form-group')[2] do
      18. fill_in :address, with: attributes_for[:address]
      19. end
      20. 1 find_all('div', class: 'form-group')[3] do
      21. fill_in :city, with: attributes_for[:city]
      22. end
      23. 1 find_all('div', class: 'form-group')[4] do
      24. fill_in :zip, with: attributes_for[:zip]
      25. end
      26. 1 find_all('div', class: 'form-group')[5] do
      27. fill_in :country, with: attributes_for[:country]
      28. end
      29. 1 find_all('div', class: 'form-group')[6] do
      30. fill_in :phone, with: attributes_for[:phone]
      31. end
      32. 1 click_on I18n.t('settings.save')
      33. end
      34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      35. end
      36. end
      37. end

      spec/feature/user_spec.rb

      100.0% lines covered

      42 relevant lines. 42 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'User', type: :feature do
      2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
      3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
      4. 1 describe '#sing_up' do
      5. 1 context 'when successfully sing_up' do
      6. 1 before do
      7. 1 visit new_user_registration_path
      8. 1 within 'form', class: 'new_user', id: 'new_user' do
      9. 1 fill_in 'user_email', with: user.email
      10. 1 fill_in 'user_password', with: user.password
      11. 1 fill_in 'user_password_confirmation', with: user.password
      12. 1 click_on I18n.t('header.sing_up')
      13. end
      14. end
      15. 1 it 'sing_up user' do
      16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      17. end
      18. end
      19. 1 context 'when unsuccessfully sing_up' do
      20. 1 it 'didn`t sing_up' do
      21. 1 visit new_user_registration_path
      22. 1 within 'form', class: 'new_user', id: 'new_user' do
      23. 1 fill_in 'user_email', with: FFaker::Internet.email
      24. 1 fill_in 'user_password', with: 'wrong'
      25. 1 fill_in 'user_password_confirmation', with: 'wrong'
      26. 1 click_on I18n.t('header.sing_up')
      27. end
      28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      29. end
      30. end
      31. end
      32. 1 describe '#login' do
      33. 1 before do
      34. 2 user_second.confirm
      35. end
      36. 1 context 'when successfully login' do
      37. 1 it 'login' do
      38. 1 visit new_user_session_path
      39. 1 within 'form', class: 'new_user', id: 'new_user' do
      40. 1 fill_in 'user_email', with: user_second.email
      41. 1 fill_in 'user_password', with: user_second.password
      42. 1 click_on I18n.t('header.log_in')
      43. end
      44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      45. end
      46. end
      47. 1 context 'when unsuccessfully login' do
      48. 1 it 'didn`t login' do
      49. 1 visit new_user_session_path
      50. 1 within 'form', class: 'new_user', id: 'new_user' do
      51. 1 fill_in 'user_email', with: user_second.email
      52. 1 fill_in 'user_password', with: 'wrong_password'
      53. 1 click_on I18n.t('header.log_in')
      54. end
      55. 1 expect(page).to have_text 'Invalid Email or password.'
      56. end
      57. end
      58. end
      59. end

      spec/models/admin_user_spec.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AdminUser, type: :model do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:email) }
      5. 2 it { is_expected.to validate_presence_of(:password) }
      6. end
      7. end

      spec/models/author_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Author, type: :model do
      2. 1 describe 'author' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:first_name) }
      5. 2 it { is_expected.to validate_presence_of(:last_name) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      9. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      10. end
      11. end
      12. end

      spec/models/authors_book_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe AuthorsBook, type: :model do
      2. 1 describe 'authors_book' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:author) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:author) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/book_spec.rb

      100.0% lines covered

      16 relevant lines. 16 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Book, type: :model do
      2. 1 describe 'books' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:title) }
      5. 2 it { is_expected.to validate_presence_of(:description) }
      6. 2 it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
      7. 2 it { is_expected.to validate_presence_of(:year_of_publication) }
      8. 2 it { is_expected.to validate_presence_of(:quantity) }
      9. 2 it { is_expected.to validate_presence_of(:materials) }
      10. 2 it { is_expected.to validate_presence_of(:dimensions) }
      11. end
      12. 1 context 'when associations' do
      13. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      14. 2 it { is_expected.to have_many(:authors).through(:authors_books) }
      15. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      16. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
      17. 2 it { is_expected.to have_many(:reviews).dependent(:destroy) }
      18. end
      19. end
      20. end

      spec/models/books_category_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BooksCategory, type: :model do
      2. 1 describe 'books_categories' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:category) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:category) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/category_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Category, type: :model do
      2. 1 describe 'category' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:name) }
      5. end
      6. 1 context 'when associations' do
      7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      9. end
      10. end
      11. end

      spec/models/order_spec.rb

      100.0% lines covered

      6 relevant lines. 6 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe Order, type: :model do
      3. 1 describe 'order' do
      4. 1 context 'when associations' do
      5. 2 it { is_expected.to have_many(:order_books).dependent(:destroy) }
      6. 2 it { is_expected.to have_many(:books).through(:order_books) }
      7. end
      8. end
      9. end

      spec/models/review_spec.rb

      100.0% lines covered

      14 relevant lines. 14 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe Review, type: :model do
      3. 1 describe 'review' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:title) }
      6. 2 it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 describe 'author' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:email) }
      5. 2 it { is_expected.to validate_presence_of(:password) }
      6. end
      7. 1 context 'with associations' do
      8. 2 it { is_expected.to have_one(:billing) }
      9. 2 it { is_expected.to have_one(:shipping) }
      10. end
      11. end
      12. end

      spec/queryes/book_query_spec.rb

      100.0% lines covered

      45 relevant lines. 45 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe BookQuery do
      3. 1 shared_examples 'sort test' do
      4. 5 it 'sort' do
      5. 5 books
      6. 5 expect(test).to eq(result)
      7. end
      8. end
      9. 3 let(:titles) { %w[Adam Zimbabwe] }
      10. 1 let(:books_dates) do
      11. 1 ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
      12. end
      13. 1 describe 'all books sort' do
      14. 1 context 'when sort by title A to Z' do
      15. 1 let(:books) do
      16. 1 create(:book, title: titles.first)
      17. 1 create(:book, title: titles.second)
      18. end
      19. 2 let(:result) { titles.second }
      20. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
      21. 1 include_examples 'sort test'
      22. end
      23. 1 context 'when sort title Z to A' do
      24. 1 let(:books) do
      25. 1 create(:book, title: titles.first)
      26. 1 create(:book, title: titles.second)
      27. end
      28. 2 let(:result) { titles.first }
      29. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
      30. 1 include_examples 'sort test'
      31. end
      32. 1 context 'when sort by price High to Low' do
      33. 1 let(:books) do
      34. 1 create(:book, price_cents: 75)
      35. 1 create(:book, price_cents: 23)
      36. end
      37. 2 let(:result) { 75 }
      38. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
      39. 1 include_examples 'sort test'
      40. end
      41. 1 context 'when sort price Low to High' do
      42. 1 let(:books) do
      43. 1 create(:book, price_cents: 75)
      44. 1 create(:book, price_cents: 23)
      45. end
      46. 2 let(:result) { 23 }
      47. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
      48. 1 include_examples 'sort test'
      49. end
      50. 1 context 'when sort by Newest' do
      51. 1 let(:books) do
      52. 1 create(:book, created_at: books_dates.first)
      53. 1 create(:book, created_at: books_dates.second)
      54. end
      55. 2 let(:result) { books_dates.first }
      56. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
      57. 1 include_examples 'sort test'
      58. end
      59. end
      60. end

      spec/support/configs/capybara.rb

      100.0% lines covered

      19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 7c4ea7f (Fix)
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe 'Author' do ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      3. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) =======
      4. >>>>>>> 998f08d (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request authentication helper methods' ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) Capybara.configure do |config| >>>>>>> 94841b5 (Featire specs)
      5. 1 config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 4552227 (Featire specs)
      6. <<<<<<< HEAD <<<<<<< HEAD
      7. =======
      8. >>>>>>> bd8bda4 (Manifest_cache true) =======
      9. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request global before and after hooks'
      10. 2 let(:first_name) { FFaker::Name.first_name }
      11. 2 let(:last_name) { FFaker::Name.last_name }
      12. 2 let(:new_name) { FFaker::Name.first_name }
      13. 2 let(:old_name) { author.first_name }
      14. 4 let(:author) { create(:author) }
      15. 1 before do
      16. 4 sign_in(create(:admin_user), :admin_user)
      17. end
      18. 1 it 'can create an author' do
      19. 1 visit 'admin/authors'
      20. 1 click_link('New Author')
      21. 1 fill_in 'author[first_name]', with: first_name
      22. 1 fill_in 'author[last_name]', with: last_name
      23. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      24. end
      25. 1 it 'can delete an author' do
      26. 1 author
      27. 1 visit 'admin/authors'
      28. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      29. end
      30. 1 it 'can view an author' do
      31. 1 author
      32. 1 visit 'admin/authors'
      33. 1 click_link('View')
      34. 1 expect(page).to have_content(author.first_name)
      35. end
      36. 1 it 'can edit an author' do
      37. 1 author
      38. 1 visit 'admin/authors'
      39. 1 click_link('Edit')
      40. 1 fill_in 'author[first_name]', with: new_name
      41. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      42. end
      43. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      32 relevant lines. 32 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. >>>>>>> c7a726c5 (Rebased) 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      5. 5 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
      6. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      7. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      8. 5 >>>>>>> 4e81ea2 (Featire specs) =======
      9. <<<<<<< HEAD 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. 5 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      11. 5 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      12. 5 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. 5 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. 5 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      15. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= book
      16. ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      17. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      18. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= =======
      19. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
      20. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      21. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      22. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      23. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      24. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      25. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 5 <<<<<<< HEAD <<<<<<< HEAD quantity { 1 } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) let(:book) { create(:book) } ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= let(:book) { create(:book) } ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:book) { create(:book) } ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= let(:book) { create(:book) } ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) let(:category_one) { FactoryBot.create(:category) } >>>>>>> 610b6138 (Featire specs)
      26. end
      27. end

      spec/factories/orders.rb

      77.78% lines covered

      9 relevant lines. 7 lines covered and 2 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :order do
      3. 5 status { 'created' }
      4. 1 transient do
      5. 1 books_count { 1 }
      6. end
      7. 1 after :create do |order, books_count|
      8. 4 order.books do
      9. Array.new(books_count) do
      10. association(:order, books: [instance])
      11. end
      12. end
      13. end
      14. end
      15. end

      spec/factories/reviews.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :review do
      3. 1 title { FFaker::Lorem.words(5) }
      4. 1 rating { FFaker::Number.rand(0..5) } >>>>>>> 5b7749a (Fix)
      5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      6. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      7. 1 =======
      8. 3 <<<<<<< HEAD ======= let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) =======
      9. 3 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      10. 3 ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
      11. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      12. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= =======
      13. 3 >>>>>>> 7a02bbe (Featire specs) =======
      14. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
      15. 3 >>>>>>> 4552227 (Featire specs) =======
      16. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) =======
      17. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) body { FFaker::Lorem.words(500) }
      18. end
      19. end

      spec/factories/shippings.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :shipping do
      3. 1 user
      4. 1 address { FFaker::AddressUA.street_address }
      5. 1 city { FFaker::AddressUA.city }
      6. 1 zip { FFaker::AddressUA.zip_code }
      7. 1 country { FFaker::AddressUA.country }
      8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
      9. end
      10. end
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

      spec/factories/users.rb

      100.0% lines covered

      2 relevant lines. 2 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :user do
      3. <<<<<<< HEAD <<<<<<< HEAD
      4. =======
      5. 1 =======
      6. 13 >>>>>>> 67ab5299 (Fix) email { FFaker::Internet.email }
      7. 20 password { 'password' }
      8. 20 confirmed_at { Time.zone.now }
      9. >>>>>>> 75fa7e1b (Rebased) end
      10. end
      <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)

      spec/factories/reviews.rb

      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)

      spec/factories/reviews.rb

      ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      >>>>>>> c033601 (Rebased)

      spec/feature/admin/author_spec.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= =======

      =======

      spec/feature/admin/author_spec.rb

      >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> 9a49b7b (Rebased) ======= 31 relevant lines. 31 lines covered and >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD FactoryBot.define do ======= <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= RSpec.describe 'Author' do >>>>>>> 9a49b7b (Rebased) ======= RSpec.describe 'Author' do >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      2. 1 <<<<<<< HEAD factory :review do ======= <<<<<<< HEAD <<<<<<< HEAD factory :review do ======= include_context 'with api request authentication helper methods' >>>>>>> 9a49b7b (Rebased) ======= include_context 'with api request authentication helper methods' >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      3. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) title { FFaker::Lorem.words(5) } <<<<<<< HEAD ======= ======= include_context 'with api request global before and after hooks' >>>>>>> 9a49b7b (Rebased) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= title { FFaker::Lorem.words(5) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> 4bf888bf (Featire specs)
      4. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs)
      5. 1 =======
      6. 5 >>>>>>> d0dc1f1 (Featire specs) =======
      7. 5 >>>>>>> 752f0c0 (Featire specs) =======
      8. 5 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs)
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      10. 1 =======
      11. 3 >>>>>>> d0dc1f1 (Featire specs) =======
      12. 3 >>>>>>> 752f0c0 (Featire specs) =======
      13. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) body { FFaker::Lorem.words(500) }
      14. end
      15. end

      spec/factories/shippings.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :shipping do
      3. 1 user
      4. 1 address { FFaker::AddressUA.street_address }
      5. 1 city { FFaker::AddressUA.city }
      6. 1 zip { FFaker::AddressUA.zip_code }
      7. 1 country { FFaker::AddressUA.country }
      8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
      9. end
      10. end
      >>>>>>> aca90e3 (Rebased)

      spec/factories/users.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :user do
      3. 17 email { FFaker::Internet.email }
      4. 24 password { 'password' }
      5. 24 confirmed_at { Time.zone.now }
      6. end
      7. end
      <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
      =======
      >>>>>>> aca90e3 (Rebased)

      spec/feature/admin/author_spec.rb

      ======= >>>>>>> 0d6dd12 (Manifest_cache true)

      =======

      spec/feature/admin/author_spec.rb

      <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true)

      100.0% lines covered

      31 relevant lines. 31 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Author' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true)
      5. 2 let(:first_name) { FFaker::Name.first_name }
      6. 2 let(:last_name) { FFaker::Name.last_name }
      7. 2 let(:new_name) { FFaker::Name.first_name }
      8. 2 let(:old_name) { author.first_name }
      9. 4 let(:author) { create(:author) }
      10. 1 before do
      11. 4 sign_in(create(:admin_user), :admin_user)
      12. end
      13. 1 it 'can create an author' do
      14. 1 visit 'admin/authors'
      15. 1 click_link('New Author')
      16. 1 fill_in 'author[first_name]', with: first_name
      17. 1 fill_in 'author[last_name]', with: last_name
      18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      19. end
      20. 1 it 'can delete an author' do
      21. 1 author
      22. 1 visit 'admin/authors'
      23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      24. end
      25. 1 it 'can view an author' do
      26. 1 author
      27. 1 visit 'admin/authors'
      28. 1 click_link('View')
      29. 1 expect(page).to have_content(author.first_name)
      30. end
      31. 1 it 'can edit an author' do
      32. 1 author
      33. 1 visit 'admin/authors'
      34. 1 click_link('Edit')
      35. 1 fill_in 'author[first_name]', with: new_name
      36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      37. end
      38. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 7 let(:book) { create(:book) } <<<<<<< HEAD ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= include_context 'with api request global before and after hooks'
      5. 2 let(:first_name) { FFaker::Name.first_name }
      6. 2 let(:last_name) { FFaker::Name.last_name }
      7. 2 let(:new_name) { FFaker::Name.first_name }
      8. 2 let(:old_name) { author.first_name }
      9. 4 let(:author) { create(:author) }
      10. 1 before do
      11. 4 sign_in(create(:admin_user), :admin_user)
      12. end
      13. 1 it 'can create an author' do
      14. 1 visit 'admin/authors'
      15. 1 click_link('New Author')
      16. 1 fill_in 'author[first_name]', with: first_name
      17. 1 fill_in 'author[last_name]', with: last_name
      18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      19. end
      20. 1 it 'can delete an author' do
      21. 1 author
      22. 1 visit 'admin/authors'
      23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      24. end
      25. 1 it 'can view an author' do
      26. 1 author
      27. 1 visit 'admin/authors'
      28. 1 click_link('View')
      29. 1 expect(page).to have_content(author.first_name)
      30. end
      31. 1 it 'can edit an author' do
      32. 1 author
      33. 1 visit 'admin/authors'
      34. 1 click_link('Edit')
      35. 1 fill_in 'author[first_name]', with: new_name
      36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      37. end
      38. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 7 let(:book) { create(:book) } <<<<<<< HEAD ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= let(:book) { create(:book) } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      5. 1 let(:params) do
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      7. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      8. 1 =======
      9. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) =======
      10. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs)
      11. 4 >>>>>>> 4e81ea2 (Featire specs) =======
      12. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      13. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
      14. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      15. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      16. 4 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      17. 4 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      18. 1 >>>>>>> 5b7749a (Fix) =======
      19. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      20. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      21. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      22. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) { title: FFaker::Book.title,
      23. description: FFaker::Book.description,
      24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= price_cents: FFaker::Number.rand(1..100), >>>>>>> 5b7749a (Fix) ======= price_cents: FFaker::Number.rand(1..100), >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      25. dimensions: FFaker::Book.cover,
      26. year_of_publication: FFaker::Number.rand(1900..2022),
      27. materials: 'Soft cover',
      28. quantity: FFaker::Number.rand(2..5) }
      29. end
      30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      31. 1 before do
      32. <<<<<<< HEAD
      33. 6 =======
      34. 4 >>>>>>> c7a726c5 (Rebased) sign_in(create(:admin_user), :admin_user)
      35. <<<<<<< HEAD
      36. 6 =======
      37. 4 >>>>>>> c7a726c5 (Rebased) book
      38. <<<<<<< HEAD
      39. 6 =======
      40. 4 >>>>>>> c7a726c5 (Rebased) visit 'admin/books'
      41. end
      42. 1 <<<<<<< HEAD it 'can create an book' do ======= it 'can create an category' do >>>>>>> c7a726c5 (Rebased)
      43. 1 click_link('New Book')
      44. 1 fill_in 'book[title]', with: params[:title]
      45. 1 fill_in 'book[description]', with: params[:description]
      46. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication] <<<<<<< HEAD
      47. 1 fill_in 'book[price_cents]', with: params[:price_cents]
      48. 1 fill_in 'book[materials]', with: params[:materials]
      49. 1 fill_in 'book[dimensions]', with: params[:dimensions]
      50. 1 fill_in 'book[quantity]', with: params[:quantity]
      51. 1 click_button('Create Book')
      52. 1 expect(page).to have_content(params[:title])
      53. end
      54. 1 it 'can delete an book' do
      55. 1 click_link('Delete')
      56. 1 expect(page).not_to have_content(book.title)
      57. end
      58. 1 it 'can view an book' do
      59. 1 click_link('View')
      60. 1 expect(page).to have_content(book.title)
      61. end
      62. 1 it 'can edit an book' do
      63. 1 click_link('Edit')
      64. 1 fill_in 'book[title]', with: 'New title'
      65. 1 click_button('Update Book')
      66. 1 expect(page).to have_content('New title')
      67. end
      68. 1 context 'when image' do
      69. 1 before do
      70. 2 click_link('Edit')
      71. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
      72. 2 click_on 'Update Book'
      73. end
      74. 1 it 'can add images to book' do
      75. 1 expect(book.reload.images.count).to eq(1)
      76. end
      77. 1 it 'can delete images from book' do
      78. 1 click_link('Edit')
      79. 1 click_link('Delete')
      80. 1 expect(book.reload.images.count).to eq(0)
      81. end
      82. end
      83. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      11. 7 >>>>>>> d0dc1f1 (Featire specs) =======
      12. 7 >>>>>>> 752f0c0 (Featire specs) =======
      13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
      14. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      16. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      18. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      19. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      20. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can create an category' do >>>>>>> 5b7749a (Fix)
      21. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('New Category') >>>>>>> 5b7749a (Fix)
      22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      23. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      24. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      25. 1 visit "books/#{book.id}"
      26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      27. >>>>>>> 5b7749a (Fix)
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      29. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) =======
      32. >>>>>>> 752f0c0 (Featire specs) =======
      33. >>>>>>> 4e81ea2 (Featire specs) =======
      34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      38. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      39. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      40. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      41. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= fill_in 'category[name]', with: category_name >>>>>>> 5b7749a (Fix)
      42. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      43. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      44. =======
      45. >>>>>>> d0dc1f1 (Featire specs) =======
      46. >>>>>>> 752f0c0 (Featire specs) =======
      47. >>>>>>> 4e81ea2 (Featire specs) =======
      48. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      51. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      52. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      53. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      54. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      55. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      56. 1 click_button('Create Category') <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      57. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(category_name) >>>>>>> 5b7749a (Fix)
      58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      59. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      60. =======
      61. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      62. 1 >>>>>>> 752f0c0 (Featire specs) =======
      63. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      64. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      65. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      66. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      67. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      68. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      69. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      70. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      71. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can delete an category' do >>>>>>> 5b7749a (Fix)
      72. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      73. 1 click_link('Delete')
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      75. >>>>>>> d0dc1f1 (Featire specs) =======
      76. >>>>>>> 752f0c0 (Featire specs) =======
      77. >>>>>>> 4e81ea2 (Featire specs) =======
      78. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      79. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      81. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      82. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      83. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      84. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      85. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      86. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      87. =======
      88. >>>>>>> d0dc1f1 (Featire specs) =======
      89. >>>>>>> 752f0c0 (Featire specs) =======
      90. >>>>>>> 4e81ea2 (Featire specs) =======
      91. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      92. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      93. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      94. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      95. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      96. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      97. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      98. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content('Catalog') ======= >>>>>>> c7a726c5 (Rebased)
      99. 1 <<<<<<< HEAD end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content(category.name) >>>>>>> 5b7749a (Fix) ======= fill_in 'book[price_cents]', with: params[:price_cents] >>>>>>> c7a726c5 (Rebased)
      100. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix) ======= fill_in 'book[materials]', with: params[:materials] >>>>>>> c7a726c5 (Rebased)
      101. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      102. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      103. =======
      104. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      105. 1 >>>>>>> 752f0c0 (Featire specs) =======
      106. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      107. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      108. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      109. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      110. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      111. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      112. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      113. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= fill_in 'book[dimensions]', with: params[:dimensions] >>>>>>> c7a726c5 (Rebased)
      114. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can view an category' do >>>>>>> 5b7749a (Fix) ======= fill_in 'book[quantity]', with: params[:quantity]
      115. 1 click_button('Create Book')
      116. 1 expect(page).to have_content(params[:title])
      117. end
      118. 1 it 'can delete an book' do
      119. 1 click_link('Delete')
      120. 1 expect(page).not_to have_content(book.title)
      121. end
      122. 1 it 'can view an book' do
      123. 1 click_link('View')
      124. 1 expect(page).to have_content(book.title)
      125. end
      126. 1 it 'can edit an book' do
      127. 1 click_link('Edit')
      128. 1 fill_in 'book[title]', with: 'New title'
      129. 1 click_button('Update Book')
      130. 1 expect(page).to have_content('New title')
      131. end
      132. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. end
      11. 1 it 'can create an category' do
      12. 1 click_link('New Category')
      13. 1 fill_in 'category[name]', with: category_name
      14. 1 click_button('Create Category')
      15. 1 expect(page).to have_content(category_name)
      16. end
      17. 1 it 'can delete an category' do
      18. 1 click_link('Delete')
      19. 1 expect(page).not_to have_content(category.name)
      20. end
      21. 1 it 'can view an category' do >>>>>>> c7a726c5 (Rebased)
      22. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('View') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('View') >>>>>>> 5b7749a (Fix) ======= click_link('View') >>>>>>> c7a726c5 (Rebased)
      23. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category.name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(category.name) >>>>>>> 5b7749a (Fix) ======= expect(page).to have_content(category.name) >>>>>>> c7a726c5 (Rebased)
      24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix) ======= end >>>>>>> c7a726c5 (Rebased)
      25. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can edit an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can edit an category' do >>>>>>> 5b7749a (Fix) ======= it 'can edit an category' do >>>>>>> c7a726c5 (Rebased)
      26. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('Edit') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('Edit') >>>>>>> 5b7749a (Fix) ======= click_link('Edit') >>>>>>> c7a726c5 (Rebased)
      27. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= fill_in 'category[name]', with: 'New Genre' >>>>>>> 5b7749a (Fix) ======= fill_in 'category[name]', with: 'New Genre' >>>>>>> c7a726c5 (Rebased)
      28. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_button('Update Category') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_button('Update Category') >>>>>>> 5b7749a (Fix) ======= click_button('Update Category') >>>>>>> c7a726c5 (Rebased)
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      31. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      32. 1 =======
      33. >>>>>>> d0dc1f1 (Featire specs) =======
      34. >>>>>>> 752f0c0 (Featire specs) =======
      35. >>>>>>> 4e81ea2 (Featire specs) =======
      36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      40. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      41. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      42. 1 >>>>>>> 5b7749a (Fix) =======
      43. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content('New Genre') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('New Genre') >>>>>>> 5b7749a (Fix) ======= expect(page).to have_content('New Genre') >>>>>>> c7a726c5 (Rebased)
      44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) end
      45. end

      spec/feature/billing_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Billing', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      6. 2 let(:user) { create(:user) }
      7. 1 let(:attributes_for) { attributes_for(:billing) }
      8. 1 describe '#fill_in', js: true do
      9. 1 it 'fill in billing' do
      10. 1 sign_in(user)
      11. 1 visit edit_user_path(user.id)
      12. 1 within('div#billing.col-md-5.mb-40') do
      13. 1 find_all('div', class: 'form-group')[0] do
      14. fill_in :first_name, with: attributes_for[:first_name]
      15. end
      16. 1 find_all('div', class: 'form-group')[1] do
      17. fill_in :last_name, with: attributes_for[:last_name]
      18. end
      19. 1 find_all('div', class: 'form-group')[2] do
      20. fill_in :address, with: attributes_for[:address]
      21. end
      22. 1 find_all('div', class: 'form-group')[3] do
      23. fill_in :city, with: attributes_for[:city]
      24. end
      25. 1 find_all('div', class: 'form-group')[4] do
      26. fill_in :zip, with: attributes_for[:zip]
      27. end
      28. 1 find_all('div', class: 'form-group')[5] do
      29. fill_in :country, with: attributes_for[:country]
      30. end
      31. 1 find_all('div', class: 'form-group')[6] do
      32. fill_in :phone, with: attributes_for[:phone]
      33. end
      34. 1 click_on I18n.t('settings.save')
      35. end
      36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      37. end
      38. end
      39. end

      spec/feature/book_spec.rb

      100.0% lines covered

      104 relevant lines. 104 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book', type: :feature do
      2. 5 let(:category_one) { create(:category) }
      3. 3 let(:category_two) { create(:category) }
      4. 1 let(:params) do
      5. 4 { title: FFaker::Book.title,
      6. description: FFaker::Book.description,
      7. price_cents: FFaker::Number.rand(1..100),
      8. dimensions: FFaker::Book.cover,
      9. year_of_publication: FFaker::Number.rand(1900..2022),
      10. materials: 'Soft cover',
      11. quantity: FFaker::Number.rand(2..5) }
      12. end
      13. 7 let(:book) { create(:book).decorate }
      14. 1 describe '#show book' do
      15. 1 it 'show books info' do
      16. 1 visit "books/#{book.id}"
      17. 1 expect(page).to have_content(book.title)
      18. end
      19. 1 it 'clicked Beck to results' do
      20. 1 visit "books/#{book.id}"
      21. 1 find('a', class: 'general-back-link').click
      22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
      23. end
      24. 1 context 'when test read more' do
      25. 1 it 'show read more' do
      26. 1 visit "books/#{book.id}"
      27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
      28. end
      29. 1 it 'clicked read more', js: true do
      30. 1 visit "books/#{book.id}"
      31. 1 <<<<<<< HEAD click_link I18n.t('book_page.read_more') ======= click_link 'Read More' >>>>>>> c7a726c5 (Rebased)
      32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
      33. end
      34. end
      35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      36. >>>>>>> d0dc1f1 (Featire specs) =======
      37. >>>>>>> 752f0c0 (Featire specs) =======
      38. >>>>>>> 4e81ea2 (Featire specs) =======
      39. >>>>>>> 08edf50 (Featire specs) =======
      40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      41. >>>>>>> 7a02bbe (Featire specs) =======
      42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      43. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      44. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) 1 context 'when quantity changes', js: true do
      45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      46. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      47. =======
      48. >>>>>>> d0dc1f1 (Featire specs) =======
      49. >>>>>>> 752f0c0 (Featire specs) =======
      50. >>>>>>> 4e81ea2 (Featire specs) =======
      51. >>>>>>> 08edf50 (Featire specs) =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      53. >>>>>>> 7a02bbe (Featire specs) =======
      54. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      55. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      56. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      57. >>>>>>> 5b7749a (Fix) =======
      58. >>>>>>> c7a726c5 (Rebased) 1 before do
      59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      60. 2 visit "books/#{book.id}"
      61. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased)
      62. 2 find('a', class: 'inc').click
      63. end
      64. 1 <<<<<<< HEAD it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      65. 1 expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
      66. end
      67. 1 <<<<<<< HEAD it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      68. 1 find('a', class: 'dec').click
      69. 1 expect(page).to have_content("€#{book.price}")
      70. end
      71. end
      72. end
      73. 1 describe '#catalog' do
      74. 1 describe 'filter by category' do
      75. 1 before do
      76. 2 category_one.books.create(params)
      77. 2 visit books_path
      78. end
      79. 1 after do
      80. 2 category_one.destroy
      81. end
      82. 1 it 'show book count for category' do
      83. 1 expect(page).to have_content(category_one.books.size)
      84. end
      85. 1 it 'filter book by category' do
      86. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      87. 1 click_on category_one.name
      88. end
      89. 1 expect(page).to have_content(category_one.books.first.title)
      90. end
      91. end
      92. 1 describe 'filter by all books' do
      93. 1 before do
      94. 2 category_one.books.create(params)
      95. 2 category_two.books.create(params)
      96. 2 visit books_path
      97. 2 click_on I18n.t('catalog_page.all')
      98. end
      99. 1 after do
      100. 2 category_one.destroy
      101. 2 category_two.destroy
      102. end
      103. 1 it 'shown books for first category' do
      104. 1 expect(page).to have_content(category_one.books.first.title)
      105. end
      106. 1 it 'shown books for second category' do
      107. 1 expect(page).to have_content(category_two.books.first.title)
      108. end
      109. end
      110. end
      111. 1 describe 'load_more' do
      112. 1 before do
      113. 3 <<<<<<< HEAD 24.times do ======= <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs)
      114. 72 books << create(:book)
      115. end
      116. end
      117. 4 let(:books) { [] }
      118. 1 it 'show books without view more button' do
      119. 1 visit books_path
      120. 1 find('a', id: 'view_more', class: 'view_more').click
      121. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
      122. end
      123. 1 context 'when view more' do
      124. 1 it 'show books with view more button' do
      125. 1 visit books_path
      126. 1 expect(page).to have_css('a', class: 'view_more')
      127. end
      128. 1 it 'show loaded books', js: true do
      129. 1 visit books_path
      130. 1 find('a', class: 'view_more').click
      131. 1 expect(page).to have_content(books.last.title)
      132. end
      133. end
      134. end
      135. 1 describe 'sort' do
      136. 1 shared_examples 'sort test' do
      137. 5 it 'sort books' do
      138. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
      139. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
      140. 5 create(:book, title: 'Anna', price_cents: 23,
      141. <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs)
      142. 5 visit books_path
      143. 5 find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
      144. id: 'menu').click
      145. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
      146. 5 click_link button
      147. end
      148. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
      149. end
      150. end
      151. 1 context 'when sort by title A to Z' do
      152. 2 let(:button) { I18n.t('catalog_page.sorting.title.asc') }
      153. 2 let(:book_title) { 'Anna' }
      154. 1 include_examples 'sort test'
      155. end
      156. 1 context 'when sort by title Z to A' do
      157. 2 let(:button) { I18n.t('catalog_page.sorting.title.desc') }
      158. 2 let(:book_title) { 'Zimbabwe' }
      159. 1 include_examples 'sort test'
      160. end
      161. 1 context 'when sort by price High to Low' do
      162. 2 let(:button) { I18n.t('catalog_page.sorting.price.desc') }
      163. 2 let(:book_title) { 'Zimbabwe' }
      164. 1 include_examples 'sort test'
      165. end
      166. 1 context 'when sort by price Low to High' do
      167. 2 let(:button) { I18n.t('catalog_page.sorting.price.asc') }
      168. 2 let(:book_title) { 'Anna' }
      169. 1 include_examples 'sort test'
      170. end
      171. 1 context 'when sort by newest' do
      172. 2 let(:button) { I18n.t('catalog_page.sorting.newer_first') }
      173. 2 let(:book_title) { 'Zimbabwe' }
      174. 1 include_examples 'sort test'
      175. end
      176. end
      177. end
      <<<<<<< HEAD =======

      spec/feature/cart_spec.rb

      96.55% lines covered

      29 relevant lines. 28 lines covered and 1 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe 'Cart', type: :feature, js: true do
      3. 5 let(:book) { FactoryBot.create(:book) }
      4. 1 before do
      5. 4 book
      6. 4 visit book_path(book.id)
      7. 4 click_button I18n.t('book_page.add_to_card')
      8. end
      9. 1 describe '#add_book_to_order' do
      10. 1 it 'add book to order' do
      11. 1 within('span', class: 'shop-icon') do
      12. 1 expect(page).to have_content(1)
      13. end
      14. end
      15. end
      16. 1 describe '#quantity_change' do
      17. 1 it 'book quantity inc' do
      18. 1 visit orders_path
      19. 1 within("a#inc#{book.id}.input-link") do
      20. 1 find('i.fa.fa-plus.line-heaght-40').click
      21. end
      22. 1 sleep(2)
      23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
      24. end
      25. 1 it 'book quantity dec' do
      26. 1 visit orders_path
      27. 1 within("a#dec#{book.id}.input-link") do
      28. 1 find('i.fa.fa-minus.line-heaght-40').click
      29. end
      30. 1 sleep(2)
      31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
      32. end
      33. end
      34. 1 describe '#remove_book_from_cart' do
      35. 1 it 'book quantity change' do
      36. 1 visit orders_path
      37. 1 find('button.close.general-cart-close').click
      38. expect(page).to have_content(I18n.t('order.messages.delete'))
      39. end
      40. end
      41. end

      spec/feature/coupon_spec.rb

      100.0% lines covered

      30 relevant lines. 30 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
      4. 1 include_context 'with api request authentication helper methods'
      5. 1 include_context 'with api request global before and after hooks'
      6. 5 let(:user) { FactoryBot.create(:user) }
      7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
      8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
      9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
      10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
      11. 1 before do
      12. 4 sign_in(user)
      13. 4 order
      14. 4 order_book
      15. 4 visit orders_path
      16. end
      17. 1 describe '#valid coupon' do
      18. 1 before do
      19. 3 fill_in 'input', with: coupon.code
      20. 3 click_button I18n.t('order.apply')
      21. end
      22. 1 it 'sub price' do
      23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
      24. end
      25. 1 it 'use coupon' do
      26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
      27. end
      28. 1 it 'count price with coupon' do
      29. 1 expect(page).to have_content('Order Total: € 10.49')
      30. end
      31. end
      32. 1 describe '#invalid coupon' do
      33. 1 it 'show error message' do
      34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
      35. 1 click_button I18n.t('order.apply')
      36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
      37. end
      38. end
      39. end
      >>>>>>> 366b257 (Fix)

      spec/feature/home_spec.rb

      100.0% lines covered

      49 relevant lines. 49 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Home', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 1 describe 'Get Started' do
      5. 1 it 'on click move to catalog page' do
      6. 1 visit root_path
      7. 1 click_on 'Get Started'
      8. 1 expect(page).to have_content('Catalog')
      9. end
      10. end
      11. 1 describe 'navbar' do
      12. 2 let(:books_category) { create(:books_category) }
      13. 1 it 'on click home move to root-path' do
      14. 1 visit books_path
      15. 1 find('a', id: 'root').click
      16. 1 expect(page).to have_content('Get Started')
      17. end
      18. 1 it 'on click category name move to root-path with books that belong to this category' do
      19. 1 books_category
      20. 1 visit root_path
      21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      22. 1 within('ul', id: 'nav') do
      23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      24. end
      25. 1 expect(page).to have_content(books_category.category.books.first.title)
      26. end
      27. 1 context 'when guest' do
      28. 1 it 'on click login go to login page' do
      29. 1 visit root_path
      30. 1 within 'div', class: 'visible-xs' do
      31. 1 click_link I18n.t('header.log_in')
      32. end
      33. 1 expect(page).to have_content(I18n.t('header.log_in'))
      34. end
      35. 1 it 'on click sing up go to sing up page' do
      36. 1 visit root_path
      37. 1 within 'div', class: 'visible-xs' do
      38. 1 click_link I18n.t('header.sing_up')
      39. end
      40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
      41. end
      42. end
      43. 1 context 'when user', js: true do
      44. 4 let(:user) { create(:user) }
      45. 1 before do
      46. 3 sign_in(user)
      47. end
      48. 1 it 'on click account show settings' do
      49. 1 visit root_path
      50. 1 click_on I18n.t('header.account')
      51. 1 expect(page).to have_content(I18n.t('header.settings'))
      52. end
      53. 1 it 'on click account show log_out' do
      54. 1 visit root_path
      55. 1 click_on I18n.t('header.account')
      56. 1 expect(page).to have_content(I18n.t('header.log_out'))
      57. end
      58. 1 it 'log_out' do
      59. 1 visit root_path
      60. 1 click_on I18n.t('header.account')
      61. 1 click_on(I18n.t('header.log_out'), match: :first)
      62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
      63. end
      64. end
      65. end
      66. end

      spec/feature/login_spec.rb

      <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> c7a726c5 (Rebased) 100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= ======= >>>>>>> c7a726c5 (Rebased) 19 relevant lines. 19 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Login', type: :feature do
      2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#login' do
      4. 1 before do
      5. 2 visit new_user_session_path
      6. end
      7. 1 context 'when successfully login' do
      8. 1 it 'login' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: user_second.email
      11. 1 fill_in 'user_password', with: user_second.password
      12. 1 click_on I18n.t('header.log_in')
      13. end
      14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      15. end
      16. end
      17. 1 context 'when unsuccessfully login' do
      18. 1 it 'didn`t login' do
      19. 1 within 'form', class: 'new_user', id: 'new_user' do
      20. 1 fill_in 'user_email', with: user_second.email
      21. 1 fill_in 'user_password', with: 'wrong_password'
      22. 1 click_on I18n.t('header.log_in')
      23. end
      24. 1 expect(page).to have_text 'Invalid Email or password.'
      25. end
      26. end
      27. end
      28. end

      spec/feature/new_password_spec.rb

      100.0% lines covered

      13 relevant lines. 13 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'New Password', type: :feature do
      4. 3 let(:user) { FactoryBot.create(:user) }
      5. 1 describe '#new_password' do
      6. 1 it 'change password' do
      7. 1 user.reset_password('newPassword', 'newPassword')
      8. 1 expect(user.password).to eq('newPassword')
      9. end
      10. 1 it 'not validate password' do
      11. 1 visit new_user_password_path
      12. 1 fill_in 'email', with: user.email
      13. 1 click_on I18n.t('login.send_instructions')
      14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
      15. end
      16. end
      17. end

      spec/feature/registration_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Registration', type: :feature do
      2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#sing_up' do
      4. 1 before do
      5. 3 visit new_user_registration_path
      6. end
      7. 1 context 'when successfully sing_up' do
      8. 1 it 'sing_up users' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
      11. 1 fill_in 'user_password', with: user.password
      12. 1 fill_in 'user_password_confirmation', with: user.password
      13. 1 click_on I18n.t('header.sing_up')
      14. end
      15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      16. end
      17. end
      18. 1 context 'when users is already exits' do
      19. 1 it 'sing_up users' do
      20. 1 within 'form', class: 'new_user', id: 'new_user' do
      21. 1 fill_in 'user_email', with: user.email
      22. 1 fill_in 'user_password', with: user.password
      23. 1 fill_in 'user_password_confirmation', with: user.password
      24. 1 click_on I18n.t('header.sing_up')
      25. end
      26. 1 expect(page).to have_text('Email has already been taken')
      27. end
      28. end
      29. 1 context 'when unsuccessfully sing_up' do
      30. 1 it 'didn`t sing_up' do
      31. 1 within 'form', class: 'new_user', id: 'new_user' do
      32. 1 fill_in 'user_email', with: FFaker::Internet.email
      33. 1 fill_in 'user_password', with: 'password'
      34. 1 fill_in 'user_password_confirmation', with: 'wrong'
      35. 1 click_on I18n.t('header.sing_up')
      36. end
      37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      38. end
      39. end
      40. end
      41. end

      spec/feature/review_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 28 relevant lines. 28 lines covered and ======= 30 relevant lines. 30 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
          
      1. 1 <<<<<<< HEAD RSpec.describe 'Review', type: :feature do ======= require_relative '../rails_helper' >>>>>>> c7a726c5 (Rebased)
      2. 1 <<<<<<< HEAD include_context 'with api request authentication helper methods' ======= require_relative '../support/shared_context' >>>>>>> c7a726c5 (Rebased)
      3. <<<<<<< HEAD
      4. 1 include_context 'with api request global before and after hooks'
      5. =======
      6. >>>>>>> c7a726c5 (Rebased)
      7. <<<<<<< HEAD
      8. 3 =======
      9. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD let(:user) { create(:user).decorate } ======= RSpec.describe 'Review', type: :feature do >>>>>>> c7a726c5 (Rebased)
      10. <<<<<<< HEAD
      11. 3 =======
      12. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD let(:book) { create(:book).decorate } ======= include_context 'with api request authentication helper methods'
      13. 1 include_context 'with api request global before and after hooks' >>>>>>> c7a726c5 (Rebased)
      14. <<<<<<< HEAD
      15. 1 =======
      16. 3 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD before do ======= let(:user) { FactoryBot.create(:user).decorate } >>>>>>> c7a726c5 (Rebased)
      17. <<<<<<< HEAD
      18. 2 =======
      19. 3 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD sign_in(user) ======= let(:book) { FactoryBot.create(:book).decorate } >>>>>>> c7a726c5 (Rebased)
      20. <<<<<<< HEAD
      21. =======
      22. 1 before do
      23. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD visit book_path(book)
      24. end ======= sign_in(user) >>>>>>> c7a726c5 (Rebased)
      25. <<<<<<< HEAD
      26. 1 shared_examples 'review' do
      27. =======
      28. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD it 'review' do ======= visit book_path(book) >>>>>>> c7a726c5 (Rebased)
      29. <<<<<<< HEAD
      30. 2 =======
      31. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD find('i', id: rating).click ======= end >>>>>>> c7a726c5 (Rebased)
      32. <<<<<<< HEAD
      33. =======
      34. >>>>>>> c7a726c5 (Rebased)
      35. <<<<<<< HEAD =======
      36. 1 shared_examples 'review' do
      37. >>>>>>> c7a726c5 (Rebased)
      38. 2 <<<<<<< HEAD fill_in :title, with: FFaker::Lorem.sentence(title_words) ======= it 'review' do >>>>>>> c7a726c5 (Rebased)
      39. 2 <<<<<<< HEAD fill_in :body, with: FFaker::Lorem.sentence(body_words) ======= find('i', id: rating).click >>>>>>> c7a726c5 (Rebased)
      40. 2 <<<<<<< HEAD click_on I18n.t('review.post') ======= fill_in :title, with: FFaker::Lorem.sentence(title_words) >>>>>>> c7a726c5 (Rebased)
      41. <<<<<<< HEAD
      42. =======
      43. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
      44. >>>>>>> c7a726c5 (Rebased)
      45. <<<<<<< HEAD
      46. =======
      47. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD expect(page).to have_content(result)
      48. end ======= click_on I18n.t('review.post') >>>>>>> c7a726c5 (Rebased)
      49. <<<<<<< HEAD =======
      50. 2 expect(page).to have_content(result)
      51. end
      52. >>>>>>> c7a726c5 (Rebased) end
      53. <<<<<<< HEAD
      54. =======
      55. >>>>>>> c7a726c5 (Rebased)
      56. <<<<<<< HEAD
      57. =======
      58. >>>>>>> c7a726c5 (Rebased) 1 describe '#post review', js: true do
      59. <<<<<<< HEAD
      60. =======
      61. >>>>>>> c7a726c5 (Rebased) 1 context 'when review posted' do
      62. <<<<<<< HEAD
      63. =======
      64. >>>>>>> c7a726c5 (Rebased) 2 let(:rating) { "star#{rand(1..5)}" }
      65. <<<<<<< HEAD
      66. =======
      67. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD let(:title_words) { 3 } ======= let(:title_words) { 5 } >>>>>>> c7a726c5 (Rebased)
      68. <<<<<<< HEAD
      69. =======
      70. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD let(:body_words) { 5 } ======= let(:body_words) { 10 } >>>>>>> c7a726c5 (Rebased)
      71. <<<<<<< HEAD
      72. =======
      73. >>>>>>> c7a726c5 (Rebased) 2 let(:result) { user.name_or_email }
      74. <<<<<<< HEAD
      75. 1 include_examples 'review'
      76. end
      77. ======= >>>>>>> c7a726c5 (Rebased)
      78. 1 <<<<<<< HEAD context 'when review not been posted' do
      79. 2 let(:rating) { "star#{rand(1..5)}" }
      80. 2 let(:title_words) { 80 }
      81. 2 let(:body_words) { 30 }
      82. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      83. 1 ======= >>>>>>> c7a726c5 (Rebased) include_examples 'review'
      84. <<<<<<< HEAD
      85. =======
      86. >>>>>>> c7a726c5 (Rebased) end
      87. <<<<<<< HEAD =======
      88. 1 context 'when review not been posted' do
      89. 2 let(:rating) { "star#{rand(1..5)}" }
      90. 2 let(:title_words) { 80 }
      91. 2 let(:body_words) { 30 }
      92. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      93. >>>>>>> c7a726c5 (Rebased)
      94. <<<<<<< HEAD =======
      95. 1 include_examples 'review'
      96. end
      97. >>>>>>> c7a726c5 (Rebased) end
      98. <<<<<<< HEAD
      99. =======
      100. >>>>>>> c7a726c5 (Rebased) end

      spec/feature/settings_spec.rb

      100.0% lines covered

      34 relevant lines. 34 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Settings', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 4 let(:user) { create(:user) }
      5. 1 before do
      6. 3 sign_in(user)
      7. 3 visit edit_user_path(user.id)
      8. 3 click_link I18n.t('settings.privacy')
      9. end
      10. 1 describe '#email_change' do
      11. 1 it 'change email' do
      12. 1 within('div', id: 'email') do
      13. 1 fill_in :email, with: FFaker::Internet.email
      14. 1 click_on I18n.t('settings.save')
      15. end
      16. 1 user.confirm
      17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      18. end
      19. end
      20. 1 describe '#password_change' do
      21. 1 context 'when error' do
      22. 1 it 'didnt change password' do
      23. 1 within('div', id: 'password') do
      24. 1 fill_in :current_password, with: user.password
      25. 1 fill_in :password, with: 'newPassword'
      26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
      27. 1 click_on I18n.t('settings.save')
      28. end
      29. 1 user.confirm
      30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
      31. end
      32. end
      33. 1 context 'when successful' do
      34. 1 it 'didnt change password' do
      35. 1 within('div', id: 'password') do
      36. 1 fill_in :current_password, with: user.password
      37. 1 fill_in :password, with: 'newPassword'
      38. 1 fill_in :password_confirmation, with: 'newPassword'
      39. 1 click_on I18n.t('settings.save')
      40. end
      41. 1 user.confirm
      42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
      43. end
      44. end
      45. end
      46. end

      spec/feature/shipping_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Shipping', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:user) { FactoryBot.create(:user) }
      5. 1 let(:attributes_for) { attributes_for(:shipping) }
      6. 1 describe '#fill_in', js: true do
      7. 1 it 'fill in shipping' do
      8. 1 sign_in(user)
      9. 1 visit edit_user_path(user.id)
      10. 1 within('div#shipping.col-md-5.mb-40') do
      11. 1 find_all('div', class: 'form-group')[0] do
      12. fill_in :first_name, with: attributes_for[:first_name]
      13. end
      14. 1 find_all('div', class: 'form-group')[1] do
      15. fill_in :last_name, with: attributes_for[:last_name]
      16. end
      17. 1 find_all('div', class: 'form-group')[2] do
      18. fill_in :address, with: attributes_for[:address]
      19. end
      20. 1 find_all('div', class: 'form-group')[3] do
      21. fill_in :city, with: attributes_for[:city]
      22. end
      23. 1 find_all('div', class: 'form-group')[4] do
      24. fill_in :zip, with: attributes_for[:zip]
      25. end
      26. 1 find_all('div', class: 'form-group')[5] do
      27. fill_in :country, with: attributes_for[:country]
      28. end
      29. 1 find_all('div', class: 'form-group')[6] do
      30. fill_in :phone, with: attributes_for[:phone]
      31. end
      32. 1 click_on I18n.t('settings.save')
      33. end
      34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      35. end
      36. end
      37. end

      spec/feature/user_spec.rb

      100.0% lines covered

      42 relevant lines. 42 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'User', type: :feature do
      2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
      3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
      4. 1 describe '#sing_up' do
      5. 1 context 'when successfully sing_up' do
      6. 1 before do
      7. 1 visit new_user_registration_path
      8. 1 within 'form', class: 'new_user', id: 'new_user' do
      9. 1 fill_in 'user_email', with: user.email
      10. 1 fill_in 'user_password', with: user.password
      11. 1 fill_in 'user_password_confirmation', with: user.password
      12. 1 click_on I18n.t('header.sing_up')
      13. end
      14. end
      15. 1 it 'sing_up user' do
      16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      17. end
      18. end
      19. 1 context 'when unsuccessfully sing_up' do
      20. 1 it 'didn`t sing_up' do
      21. 1 visit new_user_registration_path
      22. 1 within 'form', class: 'new_user', id: 'new_user' do
      23. 1 fill_in 'user_email', with: FFaker::Internet.email
      24. 1 fill_in 'user_password', with: 'wrong'
      25. 1 fill_in 'user_password_confirmation', with: 'wrong'
      26. 1 click_on I18n.t('header.sing_up')
      27. end
      28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      29. end
      30. end
      31. end
      32. 1 describe '#login' do
      33. 1 before do
      34. 2 user_second.confirm
      35. end
      36. 1 context 'when successfully login' do
      37. 1 it 'login' do
      38. 1 visit new_user_session_path
      39. 1 within 'form', class: 'new_user', id: 'new_user' do
      40. 1 fill_in 'user_email', with: user_second.email
      41. 1 fill_in 'user_password', with: user_second.password
      42. 1 click_on I18n.t('header.log_in')
      43. end
      44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      45. end
      46. end
      47. 1 context 'when unsuccessfully login' do
      48. 1 it 'didn`t login' do
      49. 1 visit new_user_session_path
      50. 1 within 'form', class: 'new_user', id: 'new_user' do
      51. 1 fill_in 'user_email', with: user_second.email
      52. 1 fill_in 'user_password', with: 'wrong_password'
      53. 1 click_on I18n.t('header.log_in')
      54. end
      55. 1 expect(page).to have_text 'Invalid Email or password.'
      56. end
      57. end
      58. end
      59. end

      spec/models/admin_user_spec.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AdminUser, type: :model do
      3. 1 context 'when validations' do
      4. 2 <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:email) }
      5. 2 it { is_expected.to validate_presence_of(:password) }
      6. end
      7. end

      spec/models/author_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD it { is_expected.to validate_presence_of(:email) } ======= RSpec.describe Author, type: :model do >>>>>>> c7a726c5 (Rebased)
      2. <<<<<<< HEAD
      3. 2 =======
      4. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD it { is_expected.to validate_presence_of(:password) } ======= describe 'author' do
      5. 1 context 'when validations' do
      6. 2 it { is_expected.to validate_presence_of(:first_name) }
      7. 2 it { is_expected.to validate_presence_of(:last_name) }
      8. end >>>>>>> c7a726c5 (Rebased)
      9. end
      10. end

      spec/models/author_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Author, type: :model do
      2. 1 describe 'author' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:first_name) }
      5. 2 it { is_expected.to validate_presence_of(:last_name) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      9. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      10. end
      11. end
      12. end

      spec/models/authors_book_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe AuthorsBook, type: :model do
      2. 1 describe 'authors_book' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:author) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:author) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/book_spec.rb

      100.0% lines covered

      16 relevant lines. 16 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Book, type: :model do
      2. 1 describe 'books' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:title) }
      5. 2 it { is_expected.to validate_presence_of(:description) }
      6. 2 it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
      7. 2 it { is_expected.to validate_presence_of(:year_of_publication) }
      8. 2 it { is_expected.to validate_presence_of(:quantity) }
      9. 2 it { is_expected.to validate_presence_of(:materials) }
      10. 2 it { is_expected.to validate_presence_of(:dimensions) }
      11. end
      12. 1 context 'when associations' do
      13. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      14. 2 it { is_expected.to have_many(:authors).through(:authors_books) }
      15. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      16. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
      17. 2 it { is_expected.to have_many(:reviews).dependent(:destroy) }
      18. end
      19. end
      20. end

      spec/models/books_category_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BooksCategory, type: :model do
      2. 1 describe 'books_categories' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:category) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:category) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/category_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Category, type: :model do
      2. 1 describe 'category' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:name) }
      5. end
      6. 1 context 'when associations' do
      7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      9. end
      10. end
      11. end

      spec/models/review_spec.rb

      100.0% lines covered

      14 relevant lines. 14 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe Review, type: :model do
      3. 1 describe 'review' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:title) }
      6. 2 it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      9 relevant lines. 9 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 let(:user) { FactoryBot.create(:user) }
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:email) }
      6. 2 it { is_expected.to validate_presence_of(:password) }
      7. end
      8. 1 context 'with associations' do
      9. 2 it { is_expected.to have_one(:billing) }
      10. 2 it { is_expected.to have_one(:shipping) }
      11. end
      12. end
      13. end

      spec/queryes/book_query_spec.rb

      100.0% lines covered

      45 relevant lines. 45 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe BookQuery do
      3. 1 shared_examples 'sort test' do
      4. 5 it 'sort' do
      5. 5 books
      6. 5 expect(test).to eq(result)
      7. end
      8. end
      9. 3 let(:titles) { %w[Adam Zimbabwe] }
      10. 1 let(:books_dates) do
      11. 1 ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
      12. end
      13. 1 describe 'all books sort' do
      14. 1 context 'when sort by title A to Z' do
      15. 1 let(:books) do
      16. 1 create(:book, title: titles.first)
      17. 1 create(:book, title: titles.second)
      18. end
      19. 2 let(:result) { titles.second }
      20. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
      21. 1 include_examples 'sort test'
      22. end
      23. 1 context 'when sort title Z to A' do
      24. 1 let(:books) do
      25. 1 create(:book, title: titles.first)
      26. 1 create(:book, title: titles.second)
      27. end
      28. 2 let(:result) { titles.first }
      29. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
      30. 1 include_examples 'sort test'
      31. end
      32. 1 context 'when sort by price High to Low' do
      33. 1 let(:books) do
      34. 1 create(:book, price_cents: 75)
      35. 1 create(:book, price_cents: 23)
      36. end
      37. 2 let(:result) { 75 }
      38. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
      39. 1 include_examples 'sort test'
      40. end
      41. 1 context 'when sort price Low to High' do
      42. 1 let(:books) do
      43. 1 create(:book, price_cents: 75)
      44. 1 create(:book, price_cents: 23)
      45. end
      46. 2 let(:result) { 23 }
      47. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
      48. 1 include_examples 'sort test'
      49. end
      50. 1 context 'when sort by Newest' do
      51. 1 let(:books) do
      52. 1 create(:book, created_at: books_dates.first)
      53. 1 create(:book, created_at: books_dates.second)
      54. end
      55. 2 let(:result) { books_dates.first }
      56. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
      57. 1 include_examples 'sort test'
      58. end
      59. end
      60. end

      spec/support/configs/capybara.rb

      100.0% lines covered

      19 relevant lines. 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed.
          
      1. 1 RSpec.describe 'Author' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD
      5. 2 let(:first_name) { FFaker::Name.first_name }
      6. 2 let(:last_name) { FFaker::Name.last_name }
      7. 2 let(:new_name) { FFaker::Name.first_name }
      8. 2 let(:old_name) { author.first_name }
      9. 4 let(:author) { create(:author) }
      10. 1 before do
      11. 4 sign_in(create(:admin_user), :admin_user)
      12. end
      13. 1 it 'can create an author' do
      14. 1 visit 'admin/authors'
      15. 1 click_link('New Author')
      16. 1 fill_in 'author[first_name]', with: first_name
      17. 1 fill_in 'author[last_name]', with: last_name
      18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      19. end
      20. 1 it 'can delete an author' do
      21. 1 author
      22. 1 visit 'admin/authors'
      23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      24. end
      25. 1 it 'can view an author' do
      26. 1 author
      27. 1 visit 'admin/authors'
      28. 1 click_link('View')
      29. 1 expect(page).to have_content(author.first_name)
      30. end
      31. 1 it 'can edit an author' do
      32. 1 author
      33. 1 visit 'admin/authors'
      34. 1 click_link('Edit')
      35. 1 fill_in 'author[first_name]', with: new_name
      36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      37. end
      38. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD
      5. 7 =======
      6. =======
      7. >>>>>>> d0dc1f1 (Featire specs) =======
      8. >>>>>>> 752f0c0 (Featire specs) 5 >>>>>>> 93bdda9 (Featire specs) =======
      9. 7 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:book) { create(:book) } ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) let(:category_one) { FactoryBot.create(:category) }
      10. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { create(:book) } >>>>>>> 872e675 (Fix) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      11. 1 let(:params) do
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      13. 1 =======
      14. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      15. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      16. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      17. 4 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) { title: FFaker::Book.title,
      18. description: FFaker::Book.description,
      19. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      20. dimensions: FFaker::Book.cover,
      21. year_of_publication: FFaker::Number.rand(1900..2022),
      22. materials: 'Soft cover',
      23. quantity: FFaker::Number.rand(2..5) }
      24. end
      25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      26. 1 before do
      27. 6 sign_in(create(:admin_user), :admin_user)
      28. 6 book
      29. 6 visit 'admin/books'
      30. end
      31. 1 it 'can create an category' do
      32. 1 click_link('New Book')
      33. 1 fill_in 'book[title]', with: params[:title]
      34. 1 fill_in 'book[description]', with: params[:description]
      35. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
      36. 1 fill_in 'book[price_cents]', with: params[:price_cents]
      37. 1 fill_in 'book[materials]', with: params[:materials]
      38. 1 fill_in 'book[dimensions]', with: params[:dimensions]
      39. 1 fill_in 'book[quantity]', with: params[:quantity]
      40. 1 click_button('Create Book')
      41. 1 expect(page).to have_content(params[:title])
      42. end
      43. 1 it 'can delete an book' do
      44. 1 click_link('Delete')
      45. 1 expect(page).not_to have_content(book.title)
      46. end
      47. 1 it 'can view an book' do
      48. 1 click_link('View')
      49. 1 expect(page).to have_content(book.title)
      50. end
      51. 1 it 'can edit an book' do
      52. 1 click_link('Edit')
      53. 1 fill_in 'book[title]', with: 'New title'
      54. 1 click_button('Update Book')
      55. 1 expect(page).to have_content('New title')
      56. end
      57. 1 context 'when image' do
      58. 1 before do
      59. 2 click_link('Edit')
      60. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
      61. 2 click_on 'Update Book'
      62. end
      63. 1 it 'can add images to book' do
      64. 1 expect(book.reload.images.count).to eq(1)
      65. end
      66. 1 it 'can delete images from book' do
      67. 1 click_link('Edit')
      68. 1 click_link('Delete')
      69. 1 expect(book.reload.images.count).to eq(0)
      70. end
      71. end
      72. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) =======
      11. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      12. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      13. 7 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can create an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      15. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('New Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      17. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      18. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      19. 1 visit "books/#{book.id}"
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      21. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      23. =======
      24. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      25. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      26. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      27. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      28. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD fill_in 'category[name]', with: category_name >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      32. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      33. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      34. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      35. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      36. 1 click_button('Create Category') <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      37. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(category_name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      39. =======
      40. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      41. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      42. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      43. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      44. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can delete an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      46. 1 click_link('Delete')
      47. <<<<<<< HEAD <<<<<<< HEAD =======
      48. >>>>>>> d0dc1f1 (Featire specs) =======
      49. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      50. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      51. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      53. =======
      54. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      55. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      56. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      57. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      58. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) expect(page).to have_content('Catalog')
      59. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).not_to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      62. =======
      63. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      64. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      65. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      66. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      67. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can view an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      68. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('View') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      69. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      71. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can edit an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      72. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('Edit') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      73. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      74. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_button('Update Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      77. 1 =======
      78. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      79. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      80. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      81. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content('New Genre') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end
      83. end

      spec/feature/billing_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Billing', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      6. 2 let(:user) { create(:user) }
      7. 1 let(:attributes_for) { attributes_for(:billing) }
      8. 1 describe '#fill_in', js: true do
      9. 1 it 'fill in billing' do
      10. 1 sign_in(user)
      11. 1 visit edit_user_path(user.id)
      12. 1 within('div#billing.col-md-5.mb-40') do
      13. 1 find_all('div', class: 'form-group')[0] do
      14. fill_in :first_name, with: attributes_for[:first_name]
      15. end
      16. 1 find_all('div', class: 'form-group')[1] do
      17. fill_in :last_name, with: attributes_for[:last_name]
      18. end
      19. 1 find_all('div', class: 'form-group')[2] do
      20. fill_in :address, with: attributes_for[:address]
      21. end
      22. 1 find_all('div', class: 'form-group')[3] do
      23. fill_in :city, with: attributes_for[:city]
      24. end
      25. 1 find_all('div', class: 'form-group')[4] do
      26. fill_in :zip, with: attributes_for[:zip]
      27. end
      28. 1 find_all('div', class: 'form-group')[5] do
      29. fill_in :country, with: attributes_for[:country]
      30. end
      31. 1 find_all('div', class: 'form-group')[6] do
      32. fill_in :phone, with: attributes_for[:phone]
      33. end
      34. 1 click_on I18n.t('settings.save')
      35. end
      36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      37. end
      38. end
      39. end

      spec/feature/book_spec.rb

      100.0% lines covered

      104 relevant lines. 104 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book', type: :feature do
      2. 5 let(:category_one) { create(:category) }
      3. 3 let(:category_two) { create(:category) }
      4. 1 let(:params) do
      5. 4 { title: FFaker::Book.title,
      6. description: FFaker::Book.description,
      7. price_cents: FFaker::Number.rand(1..100),
      8. dimensions: FFaker::Book.cover,
      9. year_of_publication: FFaker::Number.rand(1900..2022),
      10. materials: 'Soft cover',
      11. quantity: FFaker::Number.rand(2..5) }
      12. end
      13. 7 let(:book) { create(:book).decorate }
      14. 1 describe '#show book' do
      15. 1 it 'show books info' do
      16. 1 visit "books/#{book.id}"
      17. 1 expect(page).to have_content(book.title)
      18. end
      19. 1 it 'clicked Beck to results' do
      20. 1 visit "books/#{book.id}"
      21. 1 find('a', class: 'general-back-link').click
      22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
      23. end
      24. 1 context 'when test read more' do
      25. 1 it 'show read more' do
      26. 1 visit "books/#{book.id}"
      27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
      28. end
      29. 1 it 'clicked read more', js: true do
      30. 1 visit "books/#{book.id}"
      31. 1 click_link I18n.t('book_page.read_more')
      32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
      33. end
      34. end
      35. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      36. >>>>>>> d0dc1f1 (Featire specs) =======
      37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      38. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      39. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= =======
      40. >>>>>>> 4e81ea2 (Featire specs) =======
      41. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      42. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 context 'when quantity changes', js: true do
      43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      44. =======
      45. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      46. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      47. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      48. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      49. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      50. >>>>>>> 4e81ea2 (Featire specs) =======
      51. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      53. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 before do
      54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      55. 2 visit "books/#{book.id}"
      56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      57. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'inc').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'inc').click >>>>>>> 5b7749a (Fix)
      58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      61. 1 =======
      62. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      63. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      64. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      65. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      66. 2 >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD
      67. 2 >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
      68. 2 >>>>>>> e3e66f3 (Featire specs) =======
      69. 1 >>>>>>> 5b7749a (Fix) it 'increase quantity' do
      70. <<<<<<< HEAD
      71. end
      72. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= =======
      73. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'increase quantity' do >>>>>>> 872e675 (Fix) ======= it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      75. =======
      76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= =======
      77. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      78. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      79. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      80. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      81. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
      82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      83. >>>>>>> d0dc1f1 (Featire specs) =======
      84. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      85. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      86. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      87. >>>>>>> 4e81ea2 (Featire specs) =======
      88. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) end
      89. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      90. =======
      91. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      92. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      93. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      94. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      95. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      96. >>>>>>> 4e81ea2 (Featire specs) =======
      97. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      98. >>>>>>> 5b7749a (Fix)
      99. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      100. =======
      101. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      102. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      103. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      104. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      105. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      106. >>>>>>> 4e81ea2 (Featire specs) =======
      107. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      108. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'decrease quantity' do >>>>>>> 872e675 (Fix) ======= it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'decrease quantity' do >>>>>>> 5b7749a (Fix)
      109. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      110. =======
      111. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      112. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      113. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      114. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      115. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      116. >>>>>>> 4e81ea2 (Featire specs) =======
      117. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      118. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dec').click ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price * 2}")
      119. end
      120. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'dec').click >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dec').click >>>>>>> 5b7749a (Fix)
      121. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity', js: true do ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'decrease quantity', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      122. 1 find('a', class: 'dec').click
      123. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) expect(page).to have_content("€#{book.price}")
      124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      125. end
      126. end
      127. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      128. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      130. end
      131. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      132. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      133. 1 describe '#catalog' do
      134. 1 describe 'filter by category' do
      135. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      136. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe '#catalog' do
      137. 1 describe 'filter by category' do
      138. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) before do
      139. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      140. =======
      141. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      142. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      143. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      144. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      145. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      146. >>>>>>> 4e81ea2 (Featire specs) =======
      147. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      148. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      149. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      150. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      151. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      152. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      153. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      154. >>>>>>> 5b7749a (Fix) 2 category_one.books.create(params)
      155. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      156. =======
      157. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      158. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      159. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      160. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      161. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      162. >>>>>>> 4e81ea2 (Featire specs) =======
      163. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      164. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      165. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      166. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      167. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      168. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      169. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      170. >>>>>>> 5b7749a (Fix) 2 visit books_path
      171. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      172. =======
      173. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      174. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      175. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      176. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      177. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      178. >>>>>>> 4e81ea2 (Featire specs) =======
      179. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      180. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      181. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      182. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      183. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      184. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      185. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      186. >>>>>>> 5b7749a (Fix) end
      187. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      188. =======
      189. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      190. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      191. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      192. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      193. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      194. >>>>>>> 4e81ea2 (Featire specs) =======
      195. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      196. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      197. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      198. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      199. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      200. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      201. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      202. >>>>>>> 5b7749a (Fix)
      203. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      204. =======
      205. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      206. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      207. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      208. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      209. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      210. >>>>>>> 4e81ea2 (Featire specs) =======
      211. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      212. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      213. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      214. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      215. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      216. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      217. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      218. >>>>>>> 5b7749a (Fix) 1 after do
      219. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      220. =======
      221. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      222. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      223. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      224. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      225. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      226. >>>>>>> 4e81ea2 (Featire specs) =======
      227. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      228. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      229. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      230. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      231. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      232. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      233. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      234. >>>>>>> 5b7749a (Fix) 2 category_one.destroy
      235. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      236. =======
      237. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      238. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      239. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      240. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      241. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      242. >>>>>>> 4e81ea2 (Featire specs) =======
      243. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      244. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      245. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      246. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      247. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      248. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      249. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      250. >>>>>>> 5b7749a (Fix) end
      251. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      252. =======
      253. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      254. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      255. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      256. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      257. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      258. >>>>>>> 4e81ea2 (Featire specs) =======
      259. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      260. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      261. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      262. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      263. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      264. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      265. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      266. >>>>>>> 5b7749a (Fix)
      267. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      268. =======
      269. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      270. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      271. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      272. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      273. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      274. >>>>>>> 4e81ea2 (Featire specs) =======
      275. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      276. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      277. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      278. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      279. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      280. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      281. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      282. >>>>>>> 5b7749a (Fix) 1 it 'show book count for category' do
      283. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      284. =======
      285. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      286. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      287. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      288. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      289. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      290. >>>>>>> 4e81ea2 (Featire specs) =======
      291. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      292. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      293. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      294. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      295. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      296. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      297. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      298. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.size)
      299. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      300. =======
      301. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      302. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      303. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      304. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      305. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      306. >>>>>>> 4e81ea2 (Featire specs) =======
      307. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      308. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      309. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      310. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      311. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      312. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      313. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      314. >>>>>>> 5b7749a (Fix) end
      315. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      316. =======
      317. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      318. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      319. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      320. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      321. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      322. >>>>>>> 4e81ea2 (Featire specs) =======
      323. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      324. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      325. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      326. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      327. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      328. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      329. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      330. >>>>>>> 5b7749a (Fix)
      331. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      332. 1 it 'filter book by category' do
      333. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      334. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      335. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'filter book by category' do
      336. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      337. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) click_on category_one.name
      338. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      339. =======
      340. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      341. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      342. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      343. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      344. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      345. >>>>>>> 4e81ea2 (Featire specs) =======
      346. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      347. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      348. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      349. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      350. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      351. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      352. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      353. >>>>>>> 5b7749a (Fix) end
      354. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      355. =======
      356. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      357. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      358. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      359. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      360. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      361. >>>>>>> 4e81ea2 (Featire specs) =======
      362. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      363. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      364. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      365. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      366. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      367. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      368. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      369. >>>>>>> 5b7749a (Fix)
      370. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      371. =======
      372. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      373. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      374. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      375. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      376. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      377. >>>>>>> 4e81ea2 (Featire specs) =======
      378. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      379. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      380. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      381. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      382. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      383. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      384. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      385. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.first.title)
      386. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      387. =======
      388. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      389. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      390. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      391. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      392. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      393. >>>>>>> 4e81ea2 (Featire specs) =======
      394. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      395. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      396. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      397. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      398. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      399. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      400. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      401. >>>>>>> 5b7749a (Fix) end
      402. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      403. =======
      404. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      405. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      406. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      407. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      408. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      409. >>>>>>> 4e81ea2 (Featire specs) =======
      410. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      411. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      412. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      413. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      414. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      415. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      416. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      417. >>>>>>> 5b7749a (Fix) end
      418. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      419. =======
      420. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      421. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      422. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      423. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      424. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      425. >>>>>>> 4e81ea2 (Featire specs) =======
      426. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      427. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      428. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      429. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      430. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      431. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      432. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      433. >>>>>>> 5b7749a (Fix)
      434. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      435. =======
      436. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      437. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      438. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      439. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      440. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      441. >>>>>>> 4e81ea2 (Featire specs) =======
      442. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      443. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      444. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      445. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      446. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      447. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      448. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      449. >>>>>>> 5b7749a (Fix) 1 describe 'filter by all books' do
      450. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      451. =======
      452. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      453. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      454. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      455. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      456. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      457. >>>>>>> 4e81ea2 (Featire specs) =======
      458. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      459. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      460. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      461. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      462. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      463. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      464. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      465. >>>>>>> 5b7749a (Fix) 1 before do
      466. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      467. =======
      468. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      469. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      470. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      471. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      472. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      473. >>>>>>> 4e81ea2 (Featire specs) =======
      474. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      475. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      476. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      477. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      478. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      479. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      480. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      481. >>>>>>> 5b7749a (Fix) 2 category_one.books.create(params)
      482. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      483. 2 category_two.books.create(params)
      484. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      485. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 5b7749a (Fix)
      486. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_on I18n.t('catalog_page.all') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_on I18n.t('catalog_page.all') >>>>>>> 5b7749a (Fix)
      487. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      488. 2 click_on 'All'
      489. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      490. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      491. =======
      492. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      493. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      494. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      495. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      496. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      497. >>>>>>> 4e81ea2 (Featire specs) =======
      498. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      499. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      500. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      501. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      502. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      503. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      504. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      505. >>>>>>> 5b7749a (Fix)
      506. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      507. =======
      508. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      509. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      510. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      511. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      512. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      513. >>>>>>> 4e81ea2 (Featire specs) =======
      514. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      515. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      516. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      517. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      518. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      519. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      520. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      521. >>>>>>> 5b7749a (Fix) 1 after do
      522. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      523. =======
      524. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      525. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      526. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      527. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      528. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      529. >>>>>>> 4e81ea2 (Featire specs) =======
      530. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      531. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      532. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      533. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      534. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      535. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      536. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      537. >>>>>>> 5b7749a (Fix) 2 category_one.destroy
      538. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      539. =======
      540. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      541. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      542. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      543. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      544. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      545. >>>>>>> 4e81ea2 (Featire specs) =======
      546. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      547. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      548. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      549. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      550. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      551. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      552. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      553. >>>>>>> 5b7749a (Fix) 2 category_two.destroy
      554. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      555. =======
      556. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      557. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      558. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      559. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      560. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      561. >>>>>>> 4e81ea2 (Featire specs) =======
      562. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      563. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      564. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      565. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      566. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      567. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      568. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      569. >>>>>>> 5b7749a (Fix) end
      570. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      571. =======
      572. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      573. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      574. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      575. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      576. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      577. >>>>>>> 4e81ea2 (Featire specs) =======
      578. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      579. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      580. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      581. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      582. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      583. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      584. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      585. >>>>>>> 5b7749a (Fix)
      586. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      587. =======
      588. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      589. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      590. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      591. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      592. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      593. >>>>>>> 4e81ea2 (Featire specs) =======
      594. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      595. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      596. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      597. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      598. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      599. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      600. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      601. >>>>>>> 5b7749a (Fix) 1 it 'shown books for first category' do
      602. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      603. =======
      604. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      605. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      606. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      607. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      608. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      609. >>>>>>> 4e81ea2 (Featire specs) =======
      610. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      611. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      612. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      613. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      614. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      615. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      616. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      617. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.first.title)
      618. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      619. =======
      620. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      621. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      622. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      623. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      624. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      625. >>>>>>> 4e81ea2 (Featire specs) =======
      626. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      627. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      628. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      629. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      630. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      631. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      632. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      633. >>>>>>> 5b7749a (Fix) end
      634. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      635. =======
      636. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      637. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      638. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      639. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      640. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      641. >>>>>>> 4e81ea2 (Featire specs) =======
      642. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      643. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      644. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      645. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      646. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      647. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      648. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      649. >>>>>>> 5b7749a (Fix)
      650. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      651. =======
      652. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      653. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      654. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      655. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      656. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      657. >>>>>>> 4e81ea2 (Featire specs) =======
      658. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      659. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      660. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      661. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      662. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      663. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      664. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      665. >>>>>>> 5b7749a (Fix) 1 it 'shown books for second category' do
      666. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      667. =======
      668. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      669. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      670. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      671. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      672. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      673. >>>>>>> 4e81ea2 (Featire specs) =======
      674. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      675. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      676. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      677. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      678. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      679. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      680. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      681. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_two.books.first.title)
      682. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      683. end
      684. end
      685. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      686. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      687. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      688. end
      689. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      690. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      691. =======
      692. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      693. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      694. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      695. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      696. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      697. >>>>>>> 4e81ea2 (Featire specs) =======
      698. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      699. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      700. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      701. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      702. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      703. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      704. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      705. >>>>>>> 5b7749a (Fix) 1 describe 'load_more' do
      706. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      707. =======
      708. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      709. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      710. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      711. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      712. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      713. >>>>>>> 4e81ea2 (Featire specs) =======
      714. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      715. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      716. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      717. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      718. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      719. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      720. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      721. >>>>>>> 5b7749a (Fix) 1 before do
      722. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      723. =======
      724. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      725. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      726. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      727. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      728. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      729. >>>>>>> 4e81ea2 (Featire specs) =======
      730. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      731. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      732. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      733. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      734. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      735. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      736. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      737. >>>>>>> 5b7749a (Fix) 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= 24.times do >>>>>>> 872e675 (Fix) ======= 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 5b7749a (Fix)
      738. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      739. =======
      740. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      741. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      742. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      743. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      744. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      745. >>>>>>> 4e81ea2 (Featire specs) =======
      746. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      747. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      748. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      749. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      750. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      751. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      752. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      753. >>>>>>> 5b7749a (Fix) 72 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) books << create(:book)
      754. end
      755. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      756. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      757. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      758. 4 =======
      759. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      760. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      761. 4 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      762. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      763. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      764. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      765. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      766. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      767. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      768. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      769. 4 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:books) { [] } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 5b7749a (Fix)
      770. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      771. 1 =======
      772. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      773. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      774. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      775. 4 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      776. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      777. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      778. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      779. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      780. 4 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      781. 4 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      782. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'show books without view more button' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'show books without view more button' do >>>>>>> 5b7749a (Fix)
      783. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      784. 1 visit books_path
      785. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      786. >>>>>>> d0dc1f1 (Featire specs) =======
      787. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      788. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      789. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      790. >>>>>>> 4e81ea2 (Featire specs) =======
      791. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      792. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      793. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      794. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      795. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      796. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      797. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      798. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      799. 1 it 'show books without view more button' do
      800. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      801. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 5b7749a (Fix)
      802. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 5b7749a (Fix)
      803. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      804. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
      805. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      806. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      807. =======
      808. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      809. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      810. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      811. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      812. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      813. >>>>>>> 4e81ea2 (Featire specs) =======
      814. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      815. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      816. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      817. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      818. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      819. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      820. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      821. >>>>>>> 5b7749a (Fix)
      822. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      823. 1 context 'when view more' do
      824. 1 it 'show books with view more button' do
      825. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      826. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 5b7749a (Fix)
      827. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      828. =======
      829. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      830. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      831. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      832. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      833. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      834. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      835. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      836. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      837. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      838. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      839. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      840. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_css('a', class: 'view_more') >>>>>>> 5b7749a (Fix)
      841. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      842. 1 expect(page).to have_css('a', class: 'view_more')
      843. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      844. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      845. =======
      846. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      847. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      848. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      849. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      850. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      851. >>>>>>> 4e81ea2 (Featire specs) =======
      852. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      853. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      854. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      855. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      856. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      857. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      858. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      859. >>>>>>> 5b7749a (Fix)
      860. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      861. =======
      862. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      863. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      864. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      865. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      866. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      867. >>>>>>> 4e81ea2 (Featire specs) =======
      868. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      869. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      870. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      871. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      872. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      873. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      874. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      875. >>>>>>> 5b7749a (Fix) 1 it 'show loaded books', js: true do
      876. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      877. 1 visit books_path
      878. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      879. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'view_more').click >>>>>>> 5b7749a (Fix)
      880. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(books.last.title) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 5b7749a (Fix)
      881. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      882. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      883. =======
      884. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      885. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      886. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      887. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      888. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      889. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      890. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      891. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      892. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      893. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      894. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      895. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      896. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      897. end
      898. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      899. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      900. =======
      901. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      902. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      903. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      904. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      905. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      906. >>>>>>> 4e81ea2 (Featire specs) =======
      907. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      908. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      909. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      910. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      911. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      912. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      913. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      914. >>>>>>> 5b7749a (Fix) 1 describe 'sort' do
      915. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      916. =======
      917. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      918. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      919. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      920. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      921. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      922. >>>>>>> 4e81ea2 (Featire specs) =======
      923. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      924. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      925. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      926. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      927. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      928. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      929. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      930. >>>>>>> 5b7749a (Fix) 1 shared_examples 'sort test' do
      931. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      932. =======
      933. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      934. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      935. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      936. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      937. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      938. >>>>>>> 4e81ea2 (Featire specs) =======
      939. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      940. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      941. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      942. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      943. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      944. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      945. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      946. >>>>>>> 5b7749a (Fix) 5 it 'sort books' do
      947. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      948. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
      949. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
      950. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      951. 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:book, title: 'Anna', price_cents: 23, >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= create(:book, title: 'Anna', price_cents: 23, >>>>>>> 5b7749a (Fix)
      952. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 872e675 (Fix) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 5b7749a (Fix)
      953. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      954. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      955. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      956. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
      957. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      958. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      959. >>>>>>> 5b7749a (Fix)
      960. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      961. =======
      962. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      963. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      964. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      965. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      966. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      967. >>>>>>> 4e81ea2 (Featire specs) =======
      968. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      969. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      970. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      971. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      972. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      973. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      974. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      975. >>>>>>> 5b7749a (Fix) 5 visit books_path
      976. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      977. =======
      978. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      979. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      980. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      981. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      982. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      983. >>>>>>> 4e81ea2 (Featire specs) =======
      984. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      985. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      986. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      987. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      988. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      989. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      990. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      991. >>>>>>> 5b7749a (Fix)
      992. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      993. =======
      994. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      995. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      996. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      997. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      998. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      999. >>>>>>> 4e81ea2 (Featire specs) =======
      1000. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1001. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      1002. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1003. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      1004. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      1005. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1006. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      1007. >>>>>>> 5b7749a (Fix) 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
      1008. id: 'menu').click <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      1009. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
      1010. 5 click_link button
      1011. end
      1012. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
      1013. end
      1014. end
      1015. 1 context 'when sort by title A to Z' do
      1016. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 5b7749a (Fix)
      1017. 2 let(:book_title) { 'Anna' }
      1018. 1 include_examples 'sort test'
      1019. end
      1020. 1 context 'when sort by title Z to A' do
      1021. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 5b7749a (Fix)
      1022. 2 let(:book_title) { 'Zimbabwe' }
      1023. 1 include_examples 'sort test'
      1024. end
      1025. 1 context 'when sort by price High to Low' do
      1026. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 5b7749a (Fix)
      1027. 2 let(:book_title) { 'Zimbabwe' }
      1028. 1 include_examples 'sort test'
      1029. end
      1030. 1 context 'when sort by price Low to High' do
      1031. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 5b7749a (Fix)
      1032. 2 let(:book_title) { 'Anna' }
      1033. 1 include_examples 'sort test'
      1034. end
      1035. 1 context 'when sort by newest' do
      1036. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 5b7749a (Fix)
      1037. 2 let(:book_title) { 'Zimbabwe' }
      1038. 1 include_examples 'sort test'
      1039. end
      1040. end
      1041. end

      spec/feature/cart_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe 'Cart', type: :feature, js: true do
      3. 5 let(:book) { FactoryBot.create(:book) }
      4. 1 before do
      5. 4 book
      6. 4 visit book_path(book.id)
      7. 4 click_button I18n.t('book_page.add_to_card')
      8. end
      9. 1 describe '#add_book_to_order' do
      10. 1 it 'add book to order' do
      11. 1 within('span', class: 'shop-icon') do
      12. 1 expect(page).to have_content(1)
      13. end
      14. end
      15. end
      16. 1 describe '#quantity_change' do
      17. 1 it 'book quantity inc' do
      18. 1 visit orders_path
      19. 1 within("a#inc#{book.id}.input-link") do
      20. 1 find('i.fa.fa-plus.line-heaght-40').click
      21. end
      22. 1 sleep(2)
      23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
      24. end
      25. 1 it 'book quantity dec' do
      26. 1 visit orders_path
      27. 1 within("a#dec#{book.id}.input-link") do
      28. 1 find('i.fa.fa-minus.line-heaght-40').click
      29. end
      30. 1 sleep(2)
      31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
      32. end
      33. end
      34. 1 describe '#remove_book_from_cart' do
      35. 1 it 'book quantity change' do
      36. 1 visit orders_path
      37. 1 find('button.close.general-cart-close').click
      38. 1 expect(page).to have_content(I18n.t('order.messages.delete'))
      39. end
      40. end
      41. end

      spec/feature/coupon_spec.rb

      100.0% lines covered

      30 relevant lines. 30 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
      4. 1 include_context 'with api request authentication helper methods'
      5. 1 include_context 'with api request global before and after hooks'
      6. 5 let(:user) { FactoryBot.create(:user) }
      7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
      8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
      9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
      10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
      11. 1 before do
      12. 4 sign_in(user)
      13. 4 order
      14. 4 order_book
      15. 4 visit orders_path
      16. end
      17. 1 describe '#valid coupon' do
      18. 1 before do
      19. 3 fill_in 'input', with: coupon.code
      20. 3 click_button I18n.t('order.apply')
      21. end
      22. 1 it 'sub price' do
      23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
      24. end
      25. 1 it 'use coupon' do
      26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
      27. end
      28. 1 it 'count price with coupon' do
      29. 1 expect(page).to have_content('Order Total: € 10.49')
      30. end
      31. end
      32. 1 describe '#invalid coupon' do
      33. 1 it 'show error message' do
      34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
      35. 1 click_button I18n.t('order.apply')
      36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
      37. end
      38. end
      39. end

      spec/feature/home_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 49 relevant lines. 49 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Home', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 1 describe 'Get Started' do
      5. 1 it 'on click move to catalog page' do
      6. 1 visit root_path
      7. 1 click_on 'Get Started'
      8. 1 expect(page).to have_content('Catalog')
      9. end
      10. end
      11. 1 describe 'navbar' do
      12. 2 let(:books_category) { create(:books_category) }
      13. 1 it 'on click home move to root-path' do
      14. 1 visit books_path
      15. 1 find('a', id: 'root').click
      16. 1 expect(page).to have_content('Get Started')
      17. end
      18. 1 it 'on click category name move to root-path with books that belong to this category' do
      19. 1 books_category
      20. 1 visit root_path
      21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      22. 1 within('ul', id: 'nav') do
      23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      24. end
      25. 1 expect(page).to have_content(books_category.category.books.first.title)
      26. end
      27. 1 context 'when guest' do
      28. 1 it 'on click login go to login page' do
      29. 1 visit root_path
      30. 1 within 'div', class: 'visible-xs' do
      31. 1 click_link I18n.t('header.log_in')
      32. end
      33. 1 expect(page).to have_content(I18n.t('header.log_in'))
      34. end
      35. 1 it 'on click sing up go to sing up page' do
      36. 1 visit root_path
      37. 1 within 'div', class: 'visible-xs' do
      38. 1 click_link I18n.t('header.sing_up')
      39. end
      40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
      41. end
      42. end
      43. 1 context 'when user', js: true do
      44. 4 let(:user) { create(:user) }
      45. 1 before do
      46. 3 sign_in(user)
      47. end
      48. 1 it 'on click account show settings' do
      49. 1 visit root_path
      50. 1 click_on I18n.t('header.account')
      51. 1 expect(page).to have_content(I18n.t('header.settings'))
      52. end
      53. 1 it 'on click account show log_out' do
      54. 1 visit root_path
      55. 1 click_on I18n.t('header.account')
      56. 1 expect(page).to have_content(I18n.t('header.log_out'))
      57. end
      58. 1 it 'log_out' do
      59. 1 visit root_path
      60. 1 click_on I18n.t('header.account')
      61. 1 click_on(I18n.t('header.log_out'), match: :first)
      62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
      63. end
      64. end
      65. end
      66. end

      spec/feature/login_spec.rb

      >>>>>>> a5d032d (Fix) 100.0% lines covered

      <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Login', type: :feature do
      2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#login' do
      4. 1 before do
      5. 2 visit new_user_session_path
      6. end
      7. 1 context 'when successfully login' do
      8. 1 it 'login' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: user_second.email
      11. 1 fill_in 'user_password', with: user_second.password
      12. 1 click_on I18n.t('header.log_in')
      13. end
      14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      15. end
      16. end
      17. 1 context 'when unsuccessfully login' do
      18. 1 it 'didn`t login' do
      19. 1 within 'form', class: 'new_user', id: 'new_user' do
      20. 1 fill_in 'user_email', with: user_second.email
      21. 1 fill_in 'user_password', with: 'wrong_password'
      22. 1 click_on I18n.t('header.log_in')
      23. end
      24. 1 expect(page).to have_text 'Invalid Email or password.'
      25. end
      26. end
      27. end
      28. end

      spec/feature/new_password_spec.rb

      100.0% lines covered

      13 relevant lines. 13 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'New Password', type: :feature do
      4. 3 let(:user) { FactoryBot.create(:user) }
      5. 1 describe '#new_password' do
      6. 1 it 'change password' do
      7. 1 user.reset_password('newPassword', 'newPassword')
      8. 1 expect(user.password).to eq('newPassword')
      9. end
      10. 1 it 'not validate password' do
      11. 1 visit new_user_password_path
      12. 1 fill_in 'email', with: user.email
      13. 1 click_on I18n.t('login.send_instructions')
      14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
      15. end
      16. end
      17. end

      spec/feature/registration_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Registration', type: :feature do
      2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#sing_up' do
      4. 1 before do
      5. 3 visit new_user_registration_path
      6. end
      7. 1 context 'when successfully sing_up' do
      8. 1 it 'sing_up users' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
      11. 1 fill_in 'user_password', with: user.password
      12. 1 fill_in 'user_password_confirmation', with: user.password
      13. 1 click_on I18n.t('header.sing_up')
      14. end
      15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      16. end
      17. end
      18. 1 context 'when users is already exits' do
      19. 1 it 'sing_up users' do
      20. 1 within 'form', class: 'new_user', id: 'new_user' do
      21. 1 fill_in 'user_email', with: user.email
      22. 1 fill_in 'user_password', with: user.password
      23. 1 fill_in 'user_password_confirmation', with: user.password
      24. 1 click_on I18n.t('header.sing_up')
      25. end
      26. 1 expect(page).to have_text('Email has already been taken')
      27. end
      28. end
      29. 1 context 'when unsuccessfully sing_up' do
      30. 1 it 'didn`t sing_up' do
      31. 1 within 'form', class: 'new_user', id: 'new_user' do
      32. 1 fill_in 'user_email', with: FFaker::Internet.email
      33. 1 fill_in 'user_password', with: 'password'
      34. 1 fill_in 'user_password_confirmation', with: 'wrong'
      35. 1 click_on I18n.t('header.sing_up')
      36. end
      37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      38. end
      39. end
      40. end
      41. end

      spec/feature/review_spec.rb

      100.0% lines covered

      28 relevant lines. 28 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Review', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 3 let(:user) { create(:user).decorate }
      5. 3 let(:book) { create(:book).decorate }
      6. 1 before do
      7. 2 sign_in(user)
      8. 2 visit book_path(book)
      9. end
      10. 1 shared_examples 'review' do
      11. 2 it 'review' do
      12. 2 find('i', id: rating).click
      13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
      14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
      15. 2 click_on I18n.t('review.post')
      16. 2 expect(page).to have_content(result)
      17. end
      18. end
      19. 1 describe '#post review', js: true do
      20. 1 context 'when review posted' do
      21. 2 let(:rating) { "star#{rand(1..5)}" }
      22. 2 let(:title_words) { 3 }
      23. 2 let(:body_words) { 5 }
      24. 2 let(:result) { user.name_or_email }
      25. 1 include_examples 'review'
      26. end
      27. 1 context 'when review not been posted' do
      28. 2 let(:rating) { "star#{rand(1..5)}" }
      29. 2 let(:title_words) { 80 }
      30. 2 let(:body_words) { 30 }
      31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      32. 1 include_examples 'review'
      33. end
      34. end
      35. end

      spec/feature/settings_spec.rb

      100.0% lines covered

      34 relevant lines. 34 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Settings', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 4 let(:user) { create(:user) }
      5. 1 before do
      6. 3 sign_in(user)
      7. 3 visit edit_user_path(user.id)
      8. 3 click_link I18n.t('settings.privacy')
      9. end
      10. 1 describe '#email_change' do
      11. 1 it 'change email' do
      12. 1 within('div', id: 'email') do
      13. 1 fill_in :email, with: FFaker::Internet.email
      14. 1 click_on I18n.t('settings.save')
      15. end
      16. 1 user.confirm
      17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      18. end
      19. end
      20. 1 describe '#password_change' do
      21. 1 context 'when error' do
      22. 1 it 'didnt change password' do
      23. 1 within('div', id: 'password') do
      24. 1 fill_in :current_password, with: user.password
      25. 1 fill_in :password, with: 'newPassword'
      26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
      27. 1 click_on I18n.t('settings.save')
      28. end
      29. 1 user.confirm
      30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
      31. end
      32. end
      33. 1 context 'when successful' do
      34. 1 it 'didnt change password' do
      35. 1 within('div', id: 'password') do
      36. 1 fill_in :current_password, with: user.password
      37. 1 fill_in :password, with: 'newPassword'
      38. 1 fill_in :password_confirmation, with: 'newPassword'
      39. 1 click_on I18n.t('settings.save')
      40. end
      41. 1 user.confirm
      42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
      43. end
      44. end
      45. end
      46. end

      spec/feature/shipping_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Shipping', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:user) { FactoryBot.create(:user) }
      5. 1 let(:attributes_for) { attributes_for(:shipping) }
      6. 1 describe '#fill_in', js: true do
      7. 1 it 'fill in shipping' do
      8. 1 sign_in(user)
      9. 1 visit edit_user_path(user.id)
      10. 1 within('div#shipping.col-md-5.mb-40') do
      11. 1 find_all('div', class: 'form-group')[0] do
      12. fill_in :first_name, with: attributes_for[:first_name]
      13. end
      14. 1 find_all('div', class: 'form-group')[1] do
      15. fill_in :last_name, with: attributes_for[:last_name]
      16. end
      17. 1 find_all('div', class: 'form-group')[2] do
      18. fill_in :address, with: attributes_for[:address]
      19. end
      20. 1 find_all('div', class: 'form-group')[3] do
      21. fill_in :city, with: attributes_for[:city]
      22. end
      23. 1 find_all('div', class: 'form-group')[4] do
      24. fill_in :zip, with: attributes_for[:zip]
      25. end
      26. 1 find_all('div', class: 'form-group')[5] do
      27. fill_in :country, with: attributes_for[:country]
      28. end
      29. 1 find_all('div', class: 'form-group')[6] do
      30. fill_in :phone, with: attributes_for[:phone]
      31. end
      32. 1 click_on I18n.t('settings.save')
      33. end
      34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      35. end
      36. end
      37. end

      spec/feature/user_spec.rb

      100.0% lines covered

      42 relevant lines. 42 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'User', type: :feature do
      2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
      3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
      4. 1 describe '#sing_up' do
      5. 1 context 'when successfully sing_up' do
      6. 1 before do
      7. 1 visit new_user_registration_path
      8. 1 within 'form', class: 'new_user', id: 'new_user' do
      9. 1 fill_in 'user_email', with: user.email
      10. 1 fill_in 'user_password', with: user.password
      11. 1 fill_in 'user_password_confirmation', with: user.password
      12. 1 click_on I18n.t('header.sing_up')
      13. end
      14. end
      15. 1 it 'sing_up user' do
      16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      17. end
      18. end
      19. 1 context 'when unsuccessfully sing_up' do
      20. 1 it 'didn`t sing_up' do
      21. 1 visit new_user_registration_path
      22. 1 within 'form', class: 'new_user', id: 'new_user' do
      23. 1 fill_in 'user_email', with: FFaker::Internet.email
      24. 1 fill_in 'user_password', with: 'wrong'
      25. 1 fill_in 'user_password_confirmation', with: 'wrong'
      26. 1 click_on I18n.t('header.sing_up')
      27. end
      28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      29. end
      30. end
      31. end
      32. 1 describe '#login' do
      33. 1 before do
      34. 2 user_second.confirm
      35. end
      36. 1 context 'when successfully login' do
      37. 1 it 'login' do
      38. 1 visit new_user_session_path
      39. 1 within 'form', class: 'new_user', id: 'new_user' do
      40. 1 fill_in 'user_email', with: user_second.email
      41. 1 fill_in 'user_password', with: user_second.password
      42. 1 click_on I18n.t('header.log_in')
      43. end
      44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      45. end
      46. end
      47. 1 context 'when unsuccessfully login' do
      48. 1 it 'didn`t login' do
      49. 1 visit new_user_session_path
      50. 1 within 'form', class: 'new_user', id: 'new_user' do
      51. 1 fill_in 'user_email', with: user_second.email
      52. 1 fill_in 'user_password', with: 'wrong_password'
      53. 1 click_on I18n.t('header.log_in')
      54. end
      55. 1 expect(page).to have_text 'Invalid Email or password.'
      56. end
      57. end
      58. end
      59. end

      spec/models/admin_user_spec.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe AdminUser, type: :model do ======= RSpec.describe 'Homes', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe AdminUser, type: :model do >>>>>>> 5b7749a (Fix)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'when validations' do ======= describe 'Get Started' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'Get Started' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'Get Started' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 5b7749a (Fix)
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      5. 2 =======
      6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      7. 1 >>>>>>> 752f0c0 (Featire specs) =======
      8. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      15. 2 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:email) } ======= it 'on click move to catalog page' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'on click move to catalog page' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:email) } >>>>>>> 5b7749a (Fix)
      16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      17. 2 =======
      18. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      19. 1 >>>>>>> 752f0c0 (Featire specs) =======
      20. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      21. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      22. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      23. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      24. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      25. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      26. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      27. 2 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:password) } ======= visit root_path >>>>>>> d0dc1f1 (Featire specs) ======= visit root_path >>>>>>> 752f0c0 (Featire specs) ======= visit root_path >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit root_path >>>>>>> 08edf50 (Featire specs) ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit root_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit root_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:password) } >>>>>>> 5b7749a (Fix)
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      29. 1 context 'when associations' do
      30. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      31. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      32. end
      33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      35. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      36. <<<<<<< HEAD
      37. 1 describe 'navbar' do
      38. 2 let(:books_category) { FactoryBot.create(:books_category) }
      39. 1 it 'on click home move to root-path' do
      40. 1 visit books_path
      41. 1 find('a', id: 'root').click
      42. 1 expect(page).to have_content('Get Started')
      43. end
      44. 1 it 'on click category name move to root-path with books that belong to this category' do
      45. 1 books_category
      46. 1 visit root_path
      47. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      48. 1 within('ul', id: 'nav') do
      49. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      50. end
      51. 1 expect(page).to have_content(books_category.category.books.first.title)
      52. end
      53. end
      54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      55. >>>>>>> 5b7749a (Fix) end

      spec/models/author_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Author, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 5b7749a (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:first_name) }
      6. 2 it { is_expected.to validate_presence_of(:last_name) }
      7. end
      8. <<<<<<< HEAD =======
      9. >>>>>>> d0dc1f1 (Featire specs) =======
      10. >>>>>>> 752f0c0 (Featire specs) =======
      11. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      12. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      13. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      14. >>>>>>> 08edf50 (Featire specs) =======
      15. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      17. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      18. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      19. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      21. =======
      22. >>>>>>> d0dc1f1 (Featire specs) =======
      23. >>>>>>> 752f0c0 (Featire specs) =======
      24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      27. >>>>>>> 08edf50 (Featire specs) =======
      28. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      29. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      30. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      31. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      32. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      33. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 5b7749a (Fix)
      34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      35. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      36. 1 describe 'author' do
      37. 1 context 'when validations' do
      38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      39. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:authors_books).dependent(:destroy) } >>>>>>> 5b7749a (Fix)
      40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      41. =======
      42. >>>>>>> d0dc1f1 (Featire specs) =======
      43. >>>>>>> 752f0c0 (Featire specs) =======
      44. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      45. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      46. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      47. >>>>>>> 08edf50 (Featire specs) =======
      48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      49. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      51. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      52. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      53. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:books).through(:authors_books) } >>>>>>> 5b7749a (Fix)
      54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      55. =======
      56. >>>>>>> d0dc1f1 (Featire specs) =======
      57. >>>>>>> 752f0c0 (Featire specs) =======
      58. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      59. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      60. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      61. >>>>>>> 08edf50 (Featire specs) =======
      62. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      63. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      64. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      65. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      66. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      67. >>>>>>> 5b7749a (Fix) end
      68. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      69. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      70. 1 context 'when associations' do
      71. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      72. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      73. end
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      75. >>>>>>> 5b7749a (Fix) end
      76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      77. =======
      78. >>>>>>> d0dc1f1 (Featire specs) =======
      79. >>>>>>> 752f0c0 (Featire specs) =======
      80. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      81. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      82. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      83. >>>>>>> 08edf50 (Featire specs) =======
      84. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      85. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      86. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      87. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      88. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      89. >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) end

      spec/models/authors_book_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) ======= 8 relevant lines. 8 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) RSpec.describe AuthorsBook, type: :model do
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      4. =======
      5. >>>>>>> d0dc1f1 (Featire specs) =======
      6. >>>>>>> 752f0c0 (Featire specs) =======
      7. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      10. >>>>>>> 08edf50 (Featire specs) =======
      11. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      12. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      13. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      14. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      15. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      16. >>>>>>> 5b7749a (Fix) =======
      17. >>>>>>> c7a726c5 (Rebased) 1 describe 'authors_book' do
      18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      19. =======
      20. >>>>>>> d0dc1f1 (Featire specs) =======
      21. >>>>>>> 752f0c0 (Featire specs) =======
      22. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      23. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      24. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      25. >>>>>>> 08edf50 (Featire specs) =======
      26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      27. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      28. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      29. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      30. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      31. >>>>>>> 5b7749a (Fix) =======
      32. >>>>>>> c7a726c5 (Rebased) 1 context 'when validations' do
      33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      34. 2 it { is_expected.to validate_presence_of(:book) }
      35. 2 it { is_expected.to validate_presence_of(:author) }
      36. end
      37. 1 context 'when associations' do
      38. 2 it { is_expected.to belong_to(:author) }
      39. <<<<<<< HEAD 2 it { is_expected.to belong_to(:book) }
      40. end
      41. end
      42. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      7. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } >>>>>>> 5b7749a (Fix)
      8. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } >>>>>>> 5b7749a (Fix)
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      13. <<<<<<< HEAD =======
      14. >>>>>>> d0dc1f1 (Featire specs) =======
      15. >>>>>>> 752f0c0 (Featire specs) =======
      16. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      17. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      19. >>>>>>> 08edf50 (Featire specs) =======
      20. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      21. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      22. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      23. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      24. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      26. =======
      27. >>>>>>> d0dc1f1 (Featire specs) =======
      28. >>>>>>> 752f0c0 (Featire specs) =======
      29. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      30. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      32. >>>>>>> 08edf50 (Featire specs) =======
      33. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      34. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      35. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      36. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      37. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      38. >>>>>>> 5b7749a (Fix)
      39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      40. 1 context 'when not validations' do
      41. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      42. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      43. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      44. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      45. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      46. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      47. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      48. end
      49. <<<<<<< HEAD =======
      50. >>>>>>> d0dc1f1 (Featire specs) =======
      51. >>>>>>> 752f0c0 (Featire specs) =======
      52. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      55. >>>>>>> 08edf50 (Featire specs) =======
      56. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      57. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      58. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      59. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      60. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 1 context 'when associations' do
      61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      62. =======
      63. >>>>>>> d0dc1f1 (Featire specs) =======
      64. >>>>>>> 752f0c0 (Featire specs) =======
      65. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      66. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      68. >>>>>>> 08edf50 (Featire specs) =======
      69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      70. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      72. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      73. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      74. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:user) } >>>>>>> 5b7749a (Fix)
      75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      76. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      77. ======= >>>>>>> c7a726c5 (Rebased) 2 it { is_expected.to belong_to(:book) }
      78. <<<<<<< HEAD
      79. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      80. >>>>>>> 5b7749a (Fix) =======
      81. >>>>>>> c7a726c5 (Rebased) end
      82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      83. =======
      84. >>>>>>> d0dc1f1 (Featire specs) =======
      85. >>>>>>> 752f0c0 (Featire specs) =======
      86. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      87. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      88. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      89. >>>>>>> 08edf50 (Featire specs) =======
      90. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      91. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      92. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      93. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      94. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      95. >>>>>>> 5b7749a (Fix) =======
      96. >>>>>>> c7a726c5 (Rebased) end
      97. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      98. =======
      99. >>>>>>> d0dc1f1 (Featire specs) =======
      100. >>>>>>> 752f0c0 (Featire specs) =======
      101. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      102. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      103. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      104. >>>>>>> 08edf50 (Featire specs) =======
      105. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      106. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      107. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      108. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      109. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      110. >>>>>>> 5b7749a (Fix) =======
      111. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. >>>>>>> c7a726c5 (Rebased) end

      spec/models/book_spec.rb

      100.0% lines covered

      16 relevant lines. 16 lines covered and 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Book, type: :model do >>>>>>> 5b7749a (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) =======
      6. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      7. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      9. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      11. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      12. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      13. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= describe 'books' do >>>>>>> 5b7749a (Fix)
      14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c7a726c5 (Rebased) RSpec.describe Book, type: :model do
      15. 1 describe 'books' do
      16. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) context 'when validations' do
      17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      18. 2 it { is_expected.to validate_presence_of(:title) }
      19. 2 it { is_expected.to validate_presence_of(:description) }
      20. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      21. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } >>>>>>> 5b7749a (Fix)
      22. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:year_of_publication) } ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 5b7749a (Fix)
      23. =======
      24. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:quantity) } >>>>>>> 5b7749a (Fix) ======= it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } >>>>>>> c7a726c5 (Rebased)
      25. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:materials) } >>>>>>> 5b7749a (Fix)
      26. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) }
      27. 2 it { is_expected.to validate_presence_of(:materials) }
      28. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) it { is_expected.to validate_presence_of(:dimensions) }
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) =======
      32. >>>>>>> 752f0c0 (Featire specs) =======
      33. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      36. >>>>>>> 08edf50 (Featire specs) =======
      37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      40. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      41. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      42. >>>>>>> 5b7749a (Fix) =======
      43. >>>>>>> c7a726c5 (Rebased) end
      44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      45. =======
      46. >>>>>>> d0dc1f1 (Featire specs) =======
      47. >>>>>>> 752f0c0 (Featire specs) =======
      48. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      49. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      51. >>>>>>> 08edf50 (Featire specs) =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      53. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      54. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      55. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      56. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      57. >>>>>>> 5b7749a (Fix) =======
      58. >>>>>>> c7a726c5 (Rebased)
      59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      60. =======
      61. >>>>>>> d0dc1f1 (Featire specs) =======
      62. >>>>>>> 752f0c0 (Featire specs) =======
      63. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      64. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      65. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      66. >>>>>>> 08edf50 (Featire specs) =======
      67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      68. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      69. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      70. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      71. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      72. >>>>>>> 5b7749a (Fix) =======
      73. >>>>>>> c7a726c5 (Rebased) 1 context 'when associations' do
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      75. =======
      76. >>>>>>> d0dc1f1 (Featire specs) =======
      77. >>>>>>> 752f0c0 (Featire specs) =======
      78. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      79. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      81. >>>>>>> 08edf50 (Featire specs) =======
      82. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      83. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      84. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      85. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      86. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      87. >>>>>>> 5b7749a (Fix) =======
      88. >>>>>>> c7a726c5 (Rebased) 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      89. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      90. =======
      91. >>>>>>> d0dc1f1 (Featire specs) =======
      92. >>>>>>> 752f0c0 (Featire specs) =======
      93. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      94. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      95. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      96. >>>>>>> 08edf50 (Featire specs) =======
      97. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      98. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      99. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      100. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      101. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      102. >>>>>>> 5b7749a (Fix) =======
      103. >>>>>>> c7a726c5 (Rebased) 2 it { is_expected.to have_many(:authors).through(:authors_books) }
      104. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      105. =======
      106. >>>>>>> d0dc1f1 (Featire specs) =======
      107. >>>>>>> 752f0c0 (Featire specs) =======
      108. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      109. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      110. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      111. >>>>>>> 08edf50 (Featire specs) =======
      112. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      113. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      114. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      115. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      116. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      117. >>>>>>> 5b7749a (Fix) =======
      118. >>>>>>> c7a726c5 (Rebased)
      119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      120. =======
      121. >>>>>>> d0dc1f1 (Featire specs) =======
      122. >>>>>>> 752f0c0 (Featire specs) =======
      123. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      124. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      125. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      126. >>>>>>> 08edf50 (Featire specs) =======
      127. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      128. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      129. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      130. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      131. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      132. >>>>>>> 5b7749a (Fix) =======
      133. >>>>>>> c7a726c5 (Rebased) 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      134. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      135. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
      136. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      137. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:reviews).dependent(:destroy) } >>>>>>> 5b7749a (Fix) ======= it { is_expected.to have_many(:reviews).dependent(:destroy) } >>>>>>> c7a726c5 (Rebased)
      138. end
      139. end
      140. end

      spec/models/books_category_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) 8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BooksCategory, type: :model do
      2. 1 describe 'books_categories' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:category) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:category) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/category_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Category, type: :model do
      2. 1 describe 'category' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:name) }
      5. end
      6. 1 context 'when associations' do
      7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      9. end
      10. end
      11. end
      <<<<<<< HEAD

      spec/models/order_spec.rb

      =======

      spec/models/review_spec.rb

      >>>>>>> c7a726c5 (Rebased)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 6 relevant lines. 6 lines covered and >>>>>>> 5b7749a (Fix) ======= 14 relevant lines. 14 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Review, type: :model do ======= RSpec.describe BooksCategory, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Order, type: :model do ======= RSpec.describe Review, type: :model do >>>>>>> c7a726c5 (Rebased)
      3. 1 <<<<<<< HEAD describe 'order' do ======= describe 'review' do >>>>>>> c7a726c5 (Rebased)
      4. 1 context 'when associations' do
      5. 2 <<<<<<< HEAD it { is_expected.to have_many(:order_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c7a726c5 (Rebased)
      6. 2 <<<<<<< HEAD it { is_expected.to have_many(:books).through(:order_books) } ======= it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      9 relevant lines. 9 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 let(:user) { FactoryBot.create(:user) }
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:email) }
      6. 2 it { is_expected.to validate_presence_of(:password) } >>>>>>> c7a726c5 (Rebased)
      7. end
      8. end
      9. end

      spec/models/review_spec.rb

      100.0% lines covered

      14 relevant lines. 14 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe Review, type: :model do >>>>>>> 5b7749a (Fix)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe 'review' do ======= describe 'books_categories' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'books_categories' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'books_categories' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= describe 'review' do >>>>>>> 5b7749a (Fix)
      4. 1 context 'when validations' do
      5. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:title) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 5b7749a (Fix)
      6. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 describe 'author' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:email) }
      5. 2 it { is_expected.to validate_presence_of(:password) } <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      6. end
      7. <<<<<<< HEAD
      8. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'with associations' do ======= context 'when associations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when associations' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when associations' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when associations' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'with associations' do >>>>>>> c7a726c5 (Rebased)
      9. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:billing) } ======= it { is_expected.to belong_to(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_one(:billing) } >>>>>>> c7a726c5 (Rebased)
      10. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:shipping) } ======= it { is_expected.to belong_to(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_one(:shipping) } >>>>>>> c7a726c5 (Rebased)
      11. end
      12. end
      13. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)

      spec/queryes/book_query_spec.rb

      =======

      spec/models/category_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 752f0c0 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======

      spec/models/category_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/models/category_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======

      spec/models/category_spec.rb

      >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======

      spec/models/category_spec.rb

      >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======

      spec/queryes/book_query_spec.rb

      >>>>>>> c7a726c5 (Rebased)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 45 relevant lines. 45 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe BookQuery do ======= RSpec.describe Category, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe BookQuery do >>>>>>> c7a726c5 (Rebased)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) shared_examples 'sort test' do ======= describe 'category' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'category' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'category' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'category' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= shared_examples 'sort test' do >>>>>>> c7a726c5 (Rebased)
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      5. 5 =======
      6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      7. 1 >>>>>>> 752f0c0 (Featire specs) =======
      8. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      15. 5 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'sort' do ======= context 'when validations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when validations' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when validations' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when validations' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'sort' do >>>>>>> c7a726c5 (Rebased)
      16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      17. 5 =======
      18. 2 >>>>>>> d0dc1f1 (Featire specs) =======
      19. 2 >>>>>>> 752f0c0 (Featire specs) =======
      20. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      21. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      22. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      23. 2 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      24. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      25. 2 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      26. 2 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      27. 5 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) books ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= books >>>>>>> c7a726c5 (Rebased)
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      29. 5 expect(test).to eq(result)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) =======
      32. >>>>>>> 752f0c0 (Featire specs) =======
      33. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      36. >>>>>>> 08edf50 (Featire specs) =======
      37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      40. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      41. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      42. 5 >>>>>>> c7a726c5 (Rebased) expect(test).to eq(result)
      43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      44. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      45. end
      46. <<<<<<< HEAD
      47. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      48. >>>>>>> c7a726c5 (Rebased) end
      49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c7a726c5 (Rebased)
      50. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages)

      spec/models/user_spec.rb

      100.0% lines covered

      3 relevant lines. 3 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe User, type: :model do
      3. 1 pending "add some examples to (or delete) #{__FILE__}"
      4. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)

      spec/rails_helper.rb

      87.5% lines covered

      16 relevant lines. 14 lines covered and 2 lines missed.
          
      1. 1 require 'spec_helper'
      2. 1 ENV['RAILS_ENV'] ||= 'test'
      3. 1 require_relative '../config/environment'
      4. 1 abort('The Rails environment is running in production mode!') if Rails.env.production?
      5. 1 require 'rspec/rails'
      6. 1 require 'shoulda-matchers'
      7. ======= >>>>>>> 5b7749a (Fix)
      8. 1 context 'with associations' do
      9. 2 it { is_expected.to have_one(:billing) }
      10. 2 it { is_expected.to have_one(:shipping) }
      11. end
      12. end
      13. end

      spec/queryes/book_query_spec.rb

      100.0% lines covered

      45 relevant lines. 45 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe BookQuery do
      3. 1 shared_examples 'sort test' do
      4. 5 it 'sort' do
      5. 5 books
      6. 5 expect(test).to eq(result)
      7. end
      8. end
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      11. 3 =======
      12. >>>>>>> d0dc1f1 (Featire specs) =======
      13. >>>>>>> 752f0c0 (Featire specs) =======
      14. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      16. >>>>>>> 7a02bbe (Featire specs) =======
      17. >>>>>>> 4552227 (Featire specs) =======
      18. 3 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= begin >>>>>>> d0dc1f1 (Featire specs) ======= begin >>>>>>> 752f0c0 (Featire specs) ======= begin >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= begin >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= begin >>>>>>> 08edf50 (Featire specs) ======= begin >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= begin >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:titles) { %w[Adam Zimbabwe] } >>>>>>> 5b7749a (Fix)
      19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:books_dates) do ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> d0dc1f1 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:books_dates) do >>>>>>> 5b7749a (Fix)
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      21. 1 =======
      22. >>>>>>> d0dc1f1 (Featire specs) =======
      23. >>>>>>> 752f0c0 (Featire specs) =======
      24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      26. >>>>>>> 7a02bbe (Featire specs) =======
      27. >>>>>>> 4552227 (Featire specs) =======
      28. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> d0dc1f1 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] >>>>>>> 5b7749a (Fix)
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) =======
      32. >>>>>>> 752f0c0 (Featire specs) =======
      33. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      34. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      35. >>>>>>> 08edf50 (Featire specs) =======
      36. >>>>>>> 7a02bbe (Featire specs) =======
      37. >>>>>>> 4552227 (Featire specs) =======
      38. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) end ======= puts e.to_s.strip >>>>>>> d0dc1f1 (Featire specs) ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) ======= puts e.to_s.strip >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= end >>>>>>> 5b7749a (Fix)
      39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      40. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      41. exit 1
      42. end
      43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
      44. >>>>>>> 5b7749a (Fix)
      45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      46. 1 describe 'all books sort' do
      47. 1 context 'when sort by title A to Z' do
      48. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      49. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:books) do ======= RSpec.configure do |config| >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:books) do >>>>>>> 5b7749a (Fix)
      50. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) create(:book, title: titles.first) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> d0dc1f1 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= create(:book, title: titles.first) >>>>>>> 5b7749a (Fix)
      51. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) create(:book, title: titles.second) ======= config.use_transactional_fixtures = true >>>>>>> d0dc1f1 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= create(:book, title: titles.second) >>>>>>> 5b7749a (Fix)
      52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      53. end
      54. 2 let(:result) { titles.second }
      55. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
      56. <<<<<<< HEAD =======
      57. >>>>>>> d0dc1f1 (Featire specs) =======
      58. >>>>>>> 752f0c0 (Featire specs) =======
      59. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      60. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      61. >>>>>>> 08edf50 (Featire specs) =======
      62. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      63. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) include_examples 'sort test' ======= config.infer_spec_type_from_file_location! >>>>>>> d0dc1f1 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= include_examples 'sort test' >>>>>>> 5b7749a (Fix)
      64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      65. end
      66. <<<<<<< HEAD =======
      67. >>>>>>> d0dc1f1 (Featire specs) =======
      68. >>>>>>> 752f0c0 (Featire specs) =======
      69. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      70. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      71. >>>>>>> 08edf50 (Featire specs) =======
      72. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      73. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) context 'when sort title Z to A' do ======= config.filter_rails_from_backtrace! >>>>>>> d0dc1f1 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= context 'when sort title Z to A' do >>>>>>> 5b7749a (Fix)
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      75. 1 let(:books) do
      76. 1 create(:book, title: titles.first)
      77. 1 create(:book, title: titles.second)
      78. end
      79. 2 let(:result) { titles.first }
      80. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
      81. 1 include_examples 'sort test'
      82. end
      83. 1 context 'when sort by price High to Low' do
      84. 1 let(:books) do
      85. 1 create(:book, price_cents: 75)
      86. 1 create(:book, price_cents: 23)
      87. end
      88. 2 let(:result) { 75 }
      89. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
      90. 1 include_examples 'sort test'
      91. end
      92. 1 context 'when sort price Low to High' do
      93. 1 let(:books) do
      94. 1 create(:book, price_cents: 75)
      95. 1 create(:book, price_cents: 23)
      96. end
      97. 2 let(:result) { 23 }
      98. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
      99. 1 include_examples 'sort test'
      100. end
      101. 1 context 'when sort by Newest' do
      102. 1 let(:books) do
      103. 1 create(:book, created_at: books_dates.first)
      104. 1 create(:book, created_at: books_dates.second)
      105. end
      106. 2 let(:result) { books_dates.first }
      107. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
      108. 1 include_examples 'sort test'
      109. end
      110. end
      111. <<<<<<< HEAD =======
      112. >>>>>>> d0dc1f1 (Featire specs) =======
      113. >>>>>>> 752f0c0 (Featire specs) =======
      114. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      115. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      116. >>>>>>> 08edf50 (Featire specs) =======
      117. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      118. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) end

      spec/support/configs/capybara.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= 36.84% >>>>>>> bd8bda4 (Manifest_cache true) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) ======= 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 36.84% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> 5b7749a (Fix) lines covered

      19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
          
        <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true)
      1. 1 =======
      2. >>>>>>> d0dc1f1 (Featire specs) =======
      3. >>>>>>> 752f0c0 (Featire specs) =======
      4. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      5. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      6. >>>>>>> 7a02bbe (Featire specs) =======
      7. >>>>>>> 4552227 (Featire specs) =======
      8. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) RSpec.describe 'Author' do ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
      10. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      11. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) include_context 'with api request authentication helper methods' ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) Capybara.configure do |config| >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
      13. =======
      14. >>>>>>> bd8bda4 (Manifest_cache true) =======
      15. >>>>>>> 36356d3 (Featire specs) =======
      16. >>>>>>> 64dceec (Manifest_cache true) 1 config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 4552227 (Featire specs)
      17. <<<<<<< HEAD <<<<<<< HEAD
      18. =======
      19. >>>>>>> bd8bda4 (Manifest_cache true) =======
      20. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request global before and after hooks'
      21. 2 let(:first_name) { FFaker::Name.first_name }
      22. 2 let(:last_name) { FFaker::Name.last_name }
      23. 2 let(:new_name) { FFaker::Name.first_name }
      24. 2 let(:old_name) { author.first_name }
      25. 4 let(:author) { create(:author) }
      26. 1 before do
      27. 4 sign_in(create(:admin_user), :admin_user)
      28. end
      29. 1 it 'can create an author' do
      30. 1 visit 'admin/authors'
      31. 1 click_link('New Author')
      32. 1 fill_in 'author[first_name]', with: first_name
      33. 1 fill_in 'author[last_name]', with: last_name
      34. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      35. end
      36. 1 it 'can delete an author' do
      37. 1 author
      38. 1 visit 'admin/authors'
      39. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      40. end
      41. 1 it 'can view an author' do
      42. 1 author
      43. 1 visit 'admin/authors'
      44. 1 click_link('View')
      45. 1 expect(page).to have_content(author.first_name)
      46. end
      47. 1 it 'can edit an author' do
      48. 1 author
      49. 1 visit 'admin/authors'
      50. 1 click_link('Edit')
      51. 1 fill_in 'author[first_name]', with: new_name
      52. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      53. end
      54. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      32 relevant lines. 32 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD ======= =======
      5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
      7. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      8. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      9. >>>>>>> 4e81ea2 (Featire specs) =======
      10. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      11. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      12. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      13. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
      14. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
      15. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      17. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 5 <<<<<<< HEAD let(:book) { create(:book) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD let(:book) { create(:book) } ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= let(:book) { create(:book) } ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) let(:category_one) { FactoryBot.create(:category) }
      18. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      19. 1 let(:params) do
      20. <<<<<<< HEAD
      21. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      22. 1 =======
      23. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      24. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      25. 4 >>>>>>> 4e81ea2 (Featire specs) =======
      26. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      27. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      28. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      29. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
      30. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      31. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      32. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) { title: FFaker::Book.title,
      33. description: FFaker::Book.description,
      34. <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      35. dimensions: FFaker::Book.cover,
      36. year_of_publication: FFaker::Number.rand(1900..2022),
      37. materials: 'Soft cover',
      38. quantity: FFaker::Number.rand(2..5) }
      39. end
      40. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      41. 1 before do
      42. 4 sign_in(create(:admin_user), :admin_user)
      43. 4 book
      44. 4 visit 'admin/books'
      45. end
      46. 1 it 'can create an category' do
      47. 1 click_link('New Book')
      48. 1 fill_in 'book[title]', with: params[:title]
      49. 1 fill_in 'book[description]', with: params[:description]
      50. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
      51. 1 fill_in 'book[price_cents]', with: params[:price_cents]
      52. 1 fill_in 'book[materials]', with: params[:materials]
      53. 1 fill_in 'book[dimensions]', with: params[:dimensions]
      54. 1 fill_in 'book[quantity]', with: params[:quantity]
      55. 1 click_button('Create Book')
      56. 1 expect(page).to have_content(params[:title])
      57. end
      58. 1 it 'can delete an book' do
      59. 1 click_link('Delete')
      60. 1 expect(page).not_to have_content(book.title)
      61. end
      62. 1 it 'can view an book' do
      63. 1 click_link('View')
      64. 1 expect(page).to have_content(book.title)
      65. end
      66. 1 it 'can edit an book' do
      67. 1 click_link('Edit')
      68. 1 fill_in 'book[title]', with: 'New title'
      69. 1 click_button('Update Book')
      70. 1 expect(page).to have_content('New title')
      71. end
      72. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. <<<<<<< HEAD ======= =======
      11. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      12. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs)
      13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
      14. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      16. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD =======
      18. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      19. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      20. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) =======
      21. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      22. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      23. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      24. 1 <<<<<<< HEAD it 'can create an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      25. 1 <<<<<<< HEAD click_link('New Category') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      26. <<<<<<< HEAD
      27. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      28. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      29. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
      30. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= =======
      31. ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      32. 1 visit "books/#{book.id}"
      33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      34. <<<<<<< HEAD
      35. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      36. =======
      37. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      38. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      39. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      40. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      41. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      42. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      43. >>>>>>> 4e81ea2 (Featire specs) =======
      44. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      45. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      46. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      47. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      48. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      50. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      51. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      53. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      54. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      55. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      56. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      57. <<<<<<< HEAD
      58. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      59. =======
      60. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      61. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      62. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      63. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      64. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      65. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      66. >>>>>>> 4e81ea2 (Featire specs) =======
      67. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
      68. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD =======
      69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      70. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2612be03 (Featire specs) =======
      71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= =======
      72. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      73. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      74. >>>>>>> 7a02bbe (Featire specs) =======
      75. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= =======
      76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      77. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
      78. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      79. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) =======
      80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      81. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      82. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      83. 1 click_button('Create Category') <<<<<<< HEAD ======= ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      84. 1 <<<<<<< HEAD expect(page).to have_content(category_name) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      85. <<<<<<< HEAD
      86. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      87. =======
      88. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      89. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs)
      90. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      91. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      92. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      93. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      94. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD =======
      95. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      96. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      97. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) =======
      98. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      99. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      100. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      101. 1 <<<<<<< HEAD it 'can delete an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      102. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      103. 1 click_link('Delete')
      104. <<<<<<< HEAD ======= =======
      105. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      106. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      107. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      108. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      109. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      110. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      111. >>>>>>> 4e81ea2 (Featire specs) =======
      112. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      113. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      114. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      115. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      116. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      117. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      118. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      119. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      120. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      121. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      122. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      123. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      124. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      125. <<<<<<< HEAD
      126. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      127. =======
      128. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      129. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      130. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      131. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      132. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      133. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      134. >>>>>>> 4e81ea2 (Featire specs) =======
      135. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      136. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      137. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      138. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      139. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      140. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      141. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      142. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      143. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      144. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      145. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      146. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      147. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) expect(page).to have_content('Catalog')
      148. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      149. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      150. <<<<<<< HEAD
      151. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      152. =======
      153. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      154. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs)
      155. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      156. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      157. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      158. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      159. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD =======
      160. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      161. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      162. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) =======
      163. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      164. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      165. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      166. 1 <<<<<<< HEAD it 'can view an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      167. 1 <<<<<<< HEAD click_link('View') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      168. 1 <<<<<<< HEAD expect(page).to have_content(category.name) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      169. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      170. 1 <<<<<<< HEAD it 'can edit an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      171. 1 <<<<<<< HEAD click_link('Edit') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      172. 1 <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      173. 1 <<<<<<< HEAD click_button('Update Category') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      174. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      175. <<<<<<< HEAD
      176. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      177. 1 =======
      178. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      179. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs)
      180. >>>>>>> 4e81ea2 (Featire specs) =======
      181. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      182. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      183. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      184. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD expect(page).to have_content('New Genre') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD =======
      185. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      186. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      187. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) =======
      188. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      189. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      190. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      191. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      192. end

      spec/feature/billing_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Billing', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      5. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      6. 2 let(:user) { create(:user) }
      7. 1 let(:attributes_for) { attributes_for(:billing) }
      8. 1 describe '#fill_in', js: true do
      9. 1 it 'fill in billing' do
      10. 1 sign_in(user)
      11. 1 visit edit_user_path(user.id)
      12. 1 within('div#billing.col-md-5.mb-40') do
      13. 1 find_all('div', class: 'form-group')[0] do
      14. fill_in :first_name, with: attributes_for[:first_name]
      15. end
      16. 1 find_all('div', class: 'form-group')[1] do
      17. fill_in :last_name, with: attributes_for[:last_name]
      18. end
      19. 1 find_all('div', class: 'form-group')[2] do
      20. fill_in :address, with: attributes_for[:address]
      21. end
      22. 1 find_all('div', class: 'form-group')[3] do
      23. fill_in :city, with: attributes_for[:city]
      24. end
      25. 1 find_all('div', class: 'form-group')[4] do
      26. fill_in :zip, with: attributes_for[:zip]
      27. end
      28. 1 find_all('div', class: 'form-group')[5] do
      29. fill_in :country, with: attributes_for[:country]
      30. end
      31. 1 find_all('div', class: 'form-group')[6] do
      32. fill_in :phone, with: attributes_for[:phone]
      33. end
      34. 1 click_on I18n.t('settings.save')
      35. end
      36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      37. end
      38. end
      39. end

      spec/feature/book_spec.rb

      100.0% lines covered

      104 relevant lines. 104 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book', type: :feature do
      2. 5 let(:category_one) { create(:category) }
      3. 3 let(:category_two) { create(:category) }
      4. 1 let(:params) do
      5. 4 { title: FFaker::Book.title,
      6. description: FFaker::Book.description,
      7. price_cents: FFaker::Number.rand(1..100),
      8. dimensions: FFaker::Book.cover,
      9. year_of_publication: FFaker::Number.rand(1900..2022),
      10. materials: 'Soft cover',
      11. quantity: FFaker::Number.rand(2..5) }
      12. end
      13. 7 let(:book) { create(:book).decorate }
      14. 1 describe '#show book' do
      15. 1 it 'show books info' do
      16. 1 visit "books/#{book.id}"
      17. 1 expect(page).to have_content(book.title)
      18. end
      19. 1 it 'clicked Beck to results' do
      20. 1 visit "books/#{book.id}"
      21. 1 find('a', class: 'general-back-link').click
      22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
      23. end
      24. 1 context 'when test read more' do
      25. 1 it 'show read more' do
      26. 1 visit "books/#{book.id}"
      27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
      28. end
      29. 1 it 'clicked read more', js: true do
      30. 1 visit "books/#{book.id}"
      31. 1 click_link 'Read More'
      32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
      33. end
      34. end
      35. <<<<<<< HEAD ======= =======
      36. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      38. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      39. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      40. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      41. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      42. >>>>>>> 4e81ea2 (Featire specs) =======
      43. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      44. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      45. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      46. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      47. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      49. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      51. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      52. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      53. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      54. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      55. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 context 'when quantity changes', js: true do
      56. <<<<<<< HEAD
      57. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      58. =======
      59. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      60. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      61. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      62. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      63. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      64. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      65. >>>>>>> 4e81ea2 (Featire specs) =======
      66. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      68. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      69. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      70. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      71. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      72. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      73. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      74. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      75. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      76. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      77. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      78. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 before do
      79. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      80. 2 visit "books/#{book.id}"
      81. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      82. 2 <<<<<<< HEAD find('a', class: 'inc').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      83. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      84. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      85. <<<<<<< HEAD
      86. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
      87. 1 ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
      88. 1 =======
      89. 2 >>>>>>> d0dc1f1 (Featire specs) =======
      90. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do >>>>>>> 2a25e4c (Featire specs) =======
      91. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs)
      92. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs)
      93. 2 >>>>>>> 4e81ea2 (Featire specs) =======
      94. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
      95. 2 >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) find('a', class: 'inc').click
      96. end
      97. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
      98. 2 ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD find('a', class: 'inc').click
      99. end
      100. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) it 'increase quantity' do >>>>>>> 610b6138 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD
      101. 2 ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD find('a', class: 'inc').click
      102. end
      103. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
      104. 2 ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs)
      105. <<<<<<< HEAD <<<<<<< HEAD
      106. 1 >>>>>>> 2a25e4c (Featire specs) find('a', class: 'inc').click
      107. <<<<<<< HEAD
      108. =======
      109. =======
      110. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= =======
      111. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) end
      112. <<<<<<< HEAD <<<<<<< HEAD
      113. ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD
      114. =======
      115. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= =======
      116. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs)
      117. <<<<<<< HEAD <<<<<<< HEAD
      118. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) it 'increase quantity' do >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) it 'increase quantity' do >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD it 'increase quantity' do >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD it 'increase quantity' do >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      119. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs)
      120. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs)
      121. ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
      122. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> ed32b84 (Featire specs) =======
      123. ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      124. ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
      125. ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= =======
      126. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs)
      127. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      128. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) =======
      129. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= =======
      130. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      131. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= =======
      132. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
      133. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) =======
      134. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      135. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
      136. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
      137. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
      138. <<<<<<< HEAD ======= =======
      139. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
      140. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      141. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      142. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      143. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      144. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      145. >>>>>>> 4e81ea2 (Featire specs) =======
      146. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      147. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      148. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) end
      149. <<<<<<< HEAD
      150. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs)
      151. =======
      152. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) =======
      153. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      154. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      155. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      156. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      157. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      158. >>>>>>> 4e81ea2 (Featire specs) =======
      159. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      160. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      161. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs)
      162. <<<<<<< HEAD
      163. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs)
      164. =======
      165. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      166. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      167. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      168. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      169. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      170. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      171. >>>>>>> 4e81ea2 (Featire specs) =======
      172. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      173. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      174. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      175. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) it 'decrease quantity' do >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity' do >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs)
      176. <<<<<<< HEAD
      177. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs)
      178. =======
      179. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      180. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      181. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      182. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      183. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      184. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      185. >>>>>>> 4e81ea2 (Featire specs) =======
      186. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      187. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      188. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      189. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) 1 <<<<<<< HEAD find('a', class: 'dec').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= find('a', class: 'dec').click ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= find('a', class: 'dec').click ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= find('a', class: 'dec').click ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) expect(page).to have_content("€#{book.price * 2}")
      190. end
      191. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      192. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) it 'decrease quantity', js: true do <<<<<<< HEAD ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) it 'decrease quantity', js: true do <<<<<<< HEAD <<<<<<< HEAD ======= it 'decrease quantity', js: true do >>>>>>> 0d6dd12 (Manifest_cache true) ======= it 'decrease quantity', js: true do >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= it 'decrease quantity', js: true do >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) it 'decrease quantity', js: true do <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) it 'decrease quantity', js: true do <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= it 'decrease quantity', js: true do >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= it 'decrease quantity', js: true do >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= it 'decrease quantity', js: true do >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= it 'decrease quantity', js: true do >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      193. 1 find('a', class: 'dec').click
      194. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) expect(page).to have_content("€#{book.price}")
      195. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      196. end
      197. end
      198. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      199. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      200. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      201. end
      202. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      203. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      204. 1 describe '#catalog' do
      205. 1 describe 'filter by category' do
      206. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      207. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) describe '#catalog' do
      208. 1 describe 'filter by category' do
      209. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) before do
      210. <<<<<<< HEAD
      211. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      212. =======
      213. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      214. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      215. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      216. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      217. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      218. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      219. >>>>>>> 4e81ea2 (Featire specs) =======
      220. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      221. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      222. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      223. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      224. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      225. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      226. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      227. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      228. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      229. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      230. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      231. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      232. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 2 category_one.books.create(params)
      233. <<<<<<< HEAD
      234. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      235. =======
      236. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      237. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      238. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      239. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      240. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      241. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      242. >>>>>>> 4e81ea2 (Featire specs) =======
      243. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      244. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      245. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      246. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      247. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      248. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      249. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      250. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      251. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      252. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      253. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      254. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      255. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 2 visit books_path
      256. <<<<<<< HEAD
      257. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      258. =======
      259. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      260. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      261. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      262. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      263. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      264. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      265. >>>>>>> 4e81ea2 (Featire specs) =======
      266. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      267. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      268. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      269. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      270. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      271. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      272. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      273. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      274. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      275. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      276. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      277. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      278. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      279. <<<<<<< HEAD
      280. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      281. =======
      282. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      283. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      284. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      285. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      286. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      287. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      288. >>>>>>> 4e81ea2 (Featire specs) =======
      289. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      290. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      291. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      292. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      293. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      294. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      295. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      296. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      297. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      298. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      299. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      300. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      301. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      302. <<<<<<< HEAD
      303. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      304. =======
      305. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      306. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      307. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      308. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      309. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      310. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      311. >>>>>>> 4e81ea2 (Featire specs) =======
      312. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      313. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      314. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      315. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      316. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      317. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      318. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      319. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      320. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      321. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      322. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      323. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      324. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 after do
      325. <<<<<<< HEAD
      326. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      327. =======
      328. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      329. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      330. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      331. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      332. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      333. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      334. >>>>>>> 4e81ea2 (Featire specs) =======
      335. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      336. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      337. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      338. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      339. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      340. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      341. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      342. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      343. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      344. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      345. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      346. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      347. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 2 category_one.destroy
      348. <<<<<<< HEAD
      349. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      350. =======
      351. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      352. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      353. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      354. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      355. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      356. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      357. >>>>>>> 4e81ea2 (Featire specs) =======
      358. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      359. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      360. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      361. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      362. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      363. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      364. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      365. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      366. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      367. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      368. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      369. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      370. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      371. <<<<<<< HEAD
      372. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      373. =======
      374. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      375. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      376. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      377. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      378. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      379. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      380. >>>>>>> 4e81ea2 (Featire specs) =======
      381. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      382. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      383. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      384. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      385. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      386. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      387. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      388. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      389. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      390. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      391. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      392. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      393. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      394. <<<<<<< HEAD
      395. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      396. =======
      397. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      398. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      399. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      400. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      401. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      402. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      403. >>>>>>> 4e81ea2 (Featire specs) =======
      404. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      405. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      406. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      407. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      408. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      409. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      410. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      411. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      412. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      413. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      414. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      415. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      416. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 it 'show book count for category' do
      417. <<<<<<< HEAD
      418. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      419. =======
      420. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      421. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      422. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      423. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      424. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      425. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      426. >>>>>>> 4e81ea2 (Featire specs) =======
      427. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      428. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      429. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      430. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      431. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      432. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      433. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      434. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      435. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      436. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      437. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      438. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      439. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 expect(page).to have_content(category_one.books.size)
      440. <<<<<<< HEAD
      441. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      442. =======
      443. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      444. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      445. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      446. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      447. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      448. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      449. >>>>>>> 4e81ea2 (Featire specs) =======
      450. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      451. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      452. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      453. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      454. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      455. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      456. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      457. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      458. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      459. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      460. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      461. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      462. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      463. <<<<<<< HEAD
      464. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      465. =======
      466. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      467. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      468. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      469. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      470. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      471. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      472. >>>>>>> 4e81ea2 (Featire specs) =======
      473. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      474. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      475. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      476. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      477. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      478. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      479. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      480. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      481. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      482. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      483. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      484. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      485. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      486. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      487. 1 it 'filter book by category' do
      488. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      489. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      490. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it 'filter book by category' do
      491. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      492. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) click_on category_one.name
      493. <<<<<<< HEAD
      494. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      495. =======
      496. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      497. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      498. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      499. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      500. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      501. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      502. >>>>>>> 4e81ea2 (Featire specs) =======
      503. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      504. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      505. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      506. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      507. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      508. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      509. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      510. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      511. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      512. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      513. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      514. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      515. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      516. <<<<<<< HEAD
      517. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      518. =======
      519. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      520. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      521. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      522. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      523. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      524. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      525. >>>>>>> 4e81ea2 (Featire specs) =======
      526. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      527. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      528. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      529. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      530. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      531. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      532. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      533. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      534. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      535. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      536. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      537. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      538. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      539. <<<<<<< HEAD
      540. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      541. =======
      542. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      543. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      544. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      545. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      546. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      547. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      548. >>>>>>> 4e81ea2 (Featire specs) =======
      549. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      550. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      551. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      552. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      553. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      554. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      555. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      556. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      557. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      558. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      559. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      560. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      561. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 expect(page).to have_content(category_one.books.first.title)
      562. <<<<<<< HEAD
      563. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      564. =======
      565. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      566. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      567. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      568. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      569. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      570. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      571. >>>>>>> 4e81ea2 (Featire specs) =======
      572. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      573. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      574. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      575. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      576. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      577. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      578. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      579. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      580. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      581. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      582. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      583. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      584. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      585. <<<<<<< HEAD
      586. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      587. =======
      588. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      589. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      590. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      591. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      592. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      593. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      594. >>>>>>> 4e81ea2 (Featire specs) =======
      595. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      596. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      597. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      598. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      599. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      600. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      601. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      602. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      603. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      604. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      605. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      606. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      607. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      608. <<<<<<< HEAD
      609. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      610. =======
      611. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      612. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      613. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      614. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      615. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      616. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      617. >>>>>>> 4e81ea2 (Featire specs) =======
      618. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      619. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      620. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      621. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      622. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      623. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      624. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      625. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      626. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      627. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      628. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      629. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      630. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      631. <<<<<<< HEAD
      632. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      633. =======
      634. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      635. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      636. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      637. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      638. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      639. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      640. >>>>>>> 4e81ea2 (Featire specs) =======
      641. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      642. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      643. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      644. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      645. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      646. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      647. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      648. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      649. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      650. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      651. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      652. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      653. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 describe 'filter by all books' do
      654. <<<<<<< HEAD
      655. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      656. =======
      657. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      658. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      659. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      660. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      661. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      662. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      663. >>>>>>> 4e81ea2 (Featire specs) =======
      664. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      665. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      666. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      667. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      668. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      669. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      670. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      671. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      672. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      673. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      674. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      675. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      676. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 before do
      677. <<<<<<< HEAD
      678. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      679. =======
      680. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      681. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      682. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      683. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      684. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      685. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      686. >>>>>>> 4e81ea2 (Featire specs) =======
      687. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      688. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      689. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      690. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      691. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      692. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      693. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      694. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      695. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      696. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      697. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      698. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      699. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 2 category_one.books.create(params)
      700. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      701. 2 category_two.books.create(params)
      702. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      703. 2 <<<<<<< HEAD visit books_path ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      704. 2 <<<<<<< HEAD click_on I18n.t('catalog_page.all') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      705. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      706. 2 click_on 'All'
      707. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      708. <<<<<<< HEAD
      709. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      710. =======
      711. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      712. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      713. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      714. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      715. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      716. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      717. >>>>>>> 4e81ea2 (Featire specs) =======
      718. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      719. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      720. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      721. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      722. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      723. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      724. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      725. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      726. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      727. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      728. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      729. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      730. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      731. <<<<<<< HEAD
      732. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      733. =======
      734. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      735. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      736. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      737. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      738. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      739. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      740. >>>>>>> 4e81ea2 (Featire specs) =======
      741. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      742. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      743. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      744. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      745. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      746. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      747. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      748. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      749. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      750. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      751. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      752. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      753. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 after do
      754. <<<<<<< HEAD
      755. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      756. =======
      757. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      758. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      759. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      760. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      761. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      762. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      763. >>>>>>> 4e81ea2 (Featire specs) =======
      764. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      765. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      766. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      767. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      768. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      769. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      770. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      771. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      772. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      773. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      774. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      775. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      776. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 2 category_one.destroy
      777. <<<<<<< HEAD
      778. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      779. =======
      780. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      781. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      782. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      783. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      784. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      785. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      786. >>>>>>> 4e81ea2 (Featire specs) =======
      787. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      788. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      789. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      790. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      791. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      792. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      793. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      794. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      795. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      796. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      797. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      798. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      799. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 2 category_two.destroy
      800. <<<<<<< HEAD
      801. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      802. =======
      803. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      804. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      805. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      806. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      807. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      808. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      809. >>>>>>> 4e81ea2 (Featire specs) =======
      810. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      811. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      812. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      813. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      814. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      815. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      816. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      817. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      818. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      819. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      820. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      821. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      822. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      823. <<<<<<< HEAD
      824. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      825. =======
      826. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      827. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      828. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      829. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      830. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      831. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      832. >>>>>>> 4e81ea2 (Featire specs) =======
      833. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      834. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      835. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      836. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      837. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      838. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      839. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      840. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      841. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      842. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      843. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      844. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      845. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      846. <<<<<<< HEAD
      847. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      848. =======
      849. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      850. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      851. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      852. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      853. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      854. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      855. >>>>>>> 4e81ea2 (Featire specs) =======
      856. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      857. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      858. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      859. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      860. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      861. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      862. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      863. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      864. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      865. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      866. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      867. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      868. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 it 'shown books for first category' do
      869. <<<<<<< HEAD
      870. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      871. =======
      872. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      873. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      874. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      875. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      876. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      877. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      878. >>>>>>> 4e81ea2 (Featire specs) =======
      879. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      880. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      881. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      882. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      883. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      884. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      885. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      886. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      887. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      888. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      889. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      890. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      891. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 expect(page).to have_content(category_one.books.first.title)
      892. <<<<<<< HEAD
      893. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      894. =======
      895. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      896. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      897. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      898. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      899. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      900. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      901. >>>>>>> 4e81ea2 (Featire specs) =======
      902. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      903. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      904. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      905. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      906. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      907. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      908. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      909. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      910. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      911. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      912. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      913. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      914. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      915. <<<<<<< HEAD
      916. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      917. =======
      918. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      919. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      920. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      921. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      922. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      923. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      924. >>>>>>> 4e81ea2 (Featire specs) =======
      925. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      926. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      927. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      928. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      929. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      930. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      931. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      932. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      933. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      934. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      935. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      936. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      937. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      938. <<<<<<< HEAD
      939. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      940. =======
      941. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      942. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      943. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      944. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      945. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      946. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      947. >>>>>>> 4e81ea2 (Featire specs) =======
      948. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      949. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      950. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      951. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      952. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      953. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      954. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      955. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      956. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      957. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      958. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      959. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      960. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 it 'shown books for second category' do
      961. <<<<<<< HEAD
      962. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      963. =======
      964. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      965. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      966. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      967. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      968. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      969. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      970. >>>>>>> 4e81ea2 (Featire specs) =======
      971. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      972. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      973. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      974. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      975. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      976. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      977. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      978. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      979. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      980. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      981. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      982. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      983. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 expect(page).to have_content(category_two.books.first.title)
      984. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      985. end
      986. end
      987. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      988. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      989. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      990. end
      991. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      992. <<<<<<< HEAD
      993. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      994. =======
      995. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      996. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      997. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      998. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      999. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1000. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1001. >>>>>>> 4e81ea2 (Featire specs) =======
      1002. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1003. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1004. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1005. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1006. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1007. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1008. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1009. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1010. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1011. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1012. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1013. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1014. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 describe 'load_more' do
      1015. <<<<<<< HEAD
      1016. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1017. =======
      1018. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1019. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1020. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1021. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1022. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1023. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1024. >>>>>>> 4e81ea2 (Featire specs) =======
      1025. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1026. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1027. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1028. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1029. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1030. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1031. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1032. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1033. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1034. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1035. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1036. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1037. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 before do
      1038. <<<<<<< HEAD
      1039. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1040. =======
      1041. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1042. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1043. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1044. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1045. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1046. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1047. >>>>>>> 4e81ea2 (Featire specs) =======
      1048. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1049. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1050. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1051. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1052. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1053. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1054. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1055. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1056. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1057. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1058. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1059. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1060. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 3 <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= (BooksController::PAGINATION_PER_PAGE * 2).times do ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= (BooksController::PAGINATION_PER_PAGE * 2).times do ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do ======= (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do >>>>>>> 5506bd0 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= 24.times do >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1061. <<<<<<< HEAD
      1062. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1063. =======
      1064. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1065. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1066. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1067. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1068. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1069. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1070. >>>>>>> 4e81ea2 (Featire specs) =======
      1071. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1072. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1073. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1074. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1075. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1076. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1077. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1078. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1079. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1080. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1081. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1082. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1083. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 72 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) books << create(:book)
      1084. end
      1085. end <<<<<<< HEAD ======= ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1086. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1087. <<<<<<< HEAD
      1088. 4 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1089. 4 =======
      1090. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      1091. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs)
      1092. >>>>>>> 4e81ea2 (Featire specs) =======
      1093. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      1094. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      1095. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1096. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD let(:books) { [] } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD =======
      1097. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1098. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      1099. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) =======
      1100. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1101. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      1102. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1103. <<<<<<< HEAD
      1104. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1105. 1 =======
      1106. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      1107. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs)
      1108. 4 >>>>>>> 4e81ea2 (Featire specs) =======
      1109. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      1110. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      1111. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1112. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD it 'show books without view more button' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD =======
      1113. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1114. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      1115. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) =======
      1116. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1117. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      1118. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1119. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1120. 1 visit books_path
      1121. <<<<<<< HEAD ======= =======
      1122. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1123. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1124. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1125. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1126. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1127. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1128. >>>>>>> 4e81ea2 (Featire specs) =======
      1129. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1130. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1131. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1132. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1133. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1134. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1135. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1136. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1137. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1138. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1139. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1140. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1141. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1142. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1143. 1 it 'show books without view more button' do
      1144. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1145. 1 <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1146. 1 <<<<<<< HEAD expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1147. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1148. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
      1149. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      1150. <<<<<<< HEAD
      1151. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1152. =======
      1153. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1154. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1155. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1156. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1157. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1158. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1159. >>>>>>> 4e81ea2 (Featire specs) =======
      1160. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1161. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1162. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1163. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1164. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1165. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1166. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1167. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1168. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1169. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1170. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1171. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1172. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1173. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1174. 1 context 'when view more' do
      1175. 1 it 'show books with view more button' do
      1176. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1177. 1 <<<<<<< HEAD visit books_path ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1178. <<<<<<< HEAD
      1179. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1180. =======
      1181. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      1182. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs)
      1183. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1184. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      1185. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      1186. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1187. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD =======
      1188. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1189. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      1190. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) =======
      1191. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1192. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      1193. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1194. 1 <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1195. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1196. 1 expect(page).to have_css('a', class: 'view_more')
      1197. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      1198. <<<<<<< HEAD
      1199. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1200. =======
      1201. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1202. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1203. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1204. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1205. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1206. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1207. >>>>>>> 4e81ea2 (Featire specs) =======
      1208. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1209. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1210. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1211. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1212. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1213. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1214. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1215. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1216. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1217. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1218. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1219. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1220. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1221. <<<<<<< HEAD
      1222. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1223. =======
      1224. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1225. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1226. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1227. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1228. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1229. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1230. >>>>>>> 4e81ea2 (Featire specs) =======
      1231. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1232. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1233. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1234. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1235. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1236. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1237. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1238. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1239. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1240. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1241. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1242. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1243. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 it 'show loaded books', js: true do
      1244. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1245. 1 visit books_path
      1246. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1247. 1 <<<<<<< HEAD find('a', class: 'view_more').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1248. 1 <<<<<<< HEAD expect(page).to have_content(books.last.title) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1249. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1250. <<<<<<< HEAD
      1251. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1252. =======
      1253. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      1254. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs)
      1255. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1256. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      1257. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      1258. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1259. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD =======
      1260. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1261. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      1262. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) =======
      1263. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1264. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      1265. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1266. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1267. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      1268. end
      1269. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1270. <<<<<<< HEAD
      1271. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1272. =======
      1273. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1274. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1275. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1276. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1277. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1278. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1279. >>>>>>> 4e81ea2 (Featire specs) =======
      1280. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1281. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1282. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1283. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1284. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1285. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1286. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1287. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1288. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1289. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1290. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1291. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1292. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 describe 'sort' do
      1293. <<<<<<< HEAD
      1294. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1295. =======
      1296. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1297. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1298. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1299. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1300. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1301. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1302. >>>>>>> 4e81ea2 (Featire specs) =======
      1303. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1304. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1305. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1306. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1307. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1308. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1309. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1310. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1311. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1312. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1313. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1314. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1315. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 shared_examples 'sort test' do
      1316. <<<<<<< HEAD
      1317. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1318. =======
      1319. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1320. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1321. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1322. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1323. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1324. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1325. >>>>>>> 4e81ea2 (Featire specs) =======
      1326. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1327. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1328. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1329. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1330. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1331. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1332. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1333. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1334. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1335. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1336. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1337. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1338. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 5 it 'sort books' do
      1339. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1340. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
      1341. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
      1342. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1343. 5 <<<<<<< HEAD create(:book, title: 'Anna', price_cents: 23, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1344. <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 5506bd0 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1345. <<<<<<< HEAD
      1346. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1347. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      1348. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
      1349. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= =======
      1350. ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1351. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
      1352. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1353. <<<<<<< HEAD
      1354. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1355. =======
      1356. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1357. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1358. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1359. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1360. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1361. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1362. >>>>>>> 4e81ea2 (Featire specs) =======
      1363. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1364. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1365. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1366. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1367. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1368. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1369. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1370. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1371. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1372. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1373. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1374. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1375. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 5 visit books_path
      1376. <<<<<<< HEAD
      1377. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1378. =======
      1379. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1380. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1381. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1382. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1383. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1384. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1385. >>>>>>> 4e81ea2 (Featire specs) =======
      1386. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1387. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1388. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1389. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1390. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1391. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1392. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1393. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1394. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1395. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1396. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1397. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1398. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1399. <<<<<<< HEAD
      1400. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1401. =======
      1402. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      1403. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1404. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1405. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1406. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1407. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) =======
      1408. >>>>>>> 4e81ea2 (Featire specs) =======
      1409. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1410. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1411. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1412. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1413. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= =======
      1414. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1415. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= =======
      1416. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1417. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1418. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1419. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      1420. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      1421. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 5 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
      1422. id: 'menu').click <<<<<<< HEAD ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1423. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
      1424. 5 click_link button
      1425. end
      1426. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
      1427. end
      1428. end
      1429. 1 context 'when sort by title A to Z' do
      1430. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1431. 2 let(:book_title) { 'Anna' }
      1432. 1 include_examples 'sort test'
      1433. end
      1434. 1 context 'when sort by title Z to A' do
      1435. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1436. 2 let(:book_title) { 'Zimbabwe' }
      1437. 1 include_examples 'sort test'
      1438. end
      1439. 1 context 'when sort by price High to Low' do
      1440. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1441. 2 let(:book_title) { 'Zimbabwe' }
      1442. 1 include_examples 'sort test'
      1443. end
      1444. 1 context 'when sort by price Low to High' do
      1445. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1446. 2 let(:book_title) { 'Anna' }
      1447. 1 include_examples 'sort test'
      1448. end
      1449. 1 context 'when sort by newest' do
      1450. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1451. 2 let(:book_title) { 'Zimbabwe' }
      1452. 1 include_examples 'sort test'
      1453. end
      1454. end
      1455. end

      spec/feature/home_spec.rb

      100.0% lines covered

      <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 49 relevant lines. 49 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Home', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 1 describe 'Get Started' do
      5. 1 it 'on click move to catalog page' do
      6. 1 visit root_path
      7. 1 click_on 'Get Started'
      8. 1 expect(page).to have_content('Catalog')
      9. end
      10. end
      11. 1 describe 'navbar' do
      12. 2 let(:books_category) { create(:books_category) }
      13. 1 it 'on click home move to root-path' do
      14. 1 visit books_path
      15. 1 find('a', id: 'root').click
      16. 1 expect(page).to have_content('Get Started')
      17. end
      18. 1 it 'on click category name move to root-path with books that belong to this category' do
      19. 1 books_category
      20. 1 visit root_path
      21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      22. 1 within('ul', id: 'nav') do
      23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      24. end
      25. 1 expect(page).to have_content(books_category.category.books.first.title)
      26. end
      27. 1 context 'when guest' do
      28. 1 it 'on click login go to login page' do
      29. 1 visit root_path
      30. 1 within 'div', class: 'visible-xs' do
      31. 1 click_link I18n.t('header.log_in')
      32. end
      33. 1 expect(page).to have_content(I18n.t('header.log_in'))
      34. end
      35. 1 it 'on click sing up go to sing up page' do
      36. 1 visit root_path
      37. 1 within 'div', class: 'visible-xs' do
      38. 1 click_link I18n.t('header.sing_up')
      39. end
      40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
      41. end
      42. end
      43. 1 context 'when user', js: true do
      44. 4 let(:user) { create(:user) }
      45. 1 before do
      46. 3 sign_in(user)
      47. end
      48. 1 it 'on click account show settings' do
      49. 1 visit root_path
      50. 1 click_on I18n.t('header.account')
      51. 1 expect(page).to have_content(I18n.t('header.settings'))
      52. end
      53. 1 it 'on click account show log_out' do
      54. 1 visit root_path
      55. 1 click_on I18n.t('header.account')
      56. 1 expect(page).to have_content(I18n.t('header.log_out'))
      57. end
      58. 1 it 'log_out' do
      59. 1 visit root_path
      60. 1 click_on I18n.t('header.account')
      61. 1 click_on(I18n.t('header.log_out'), match: :first)
      62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
      63. end
      64. end
      65. end
      66. end

      spec/feature/login_spec.rb

      100.0% lines covered

      19 relevant lines. 19 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Login', type: :feature do
      2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#login' do
      4. 1 before do
      5. 2 visit new_user_session_path
      6. end
      7. 1 context 'when successfully login' do
      8. 1 it 'login' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: user_second.email
      11. 1 fill_in 'user_password', with: user_second.password
      12. 1 click_on I18n.t('header.log_in')
      13. end
      14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      15. end
      16. end
      17. 1 context 'when unsuccessfully login' do
      18. 1 it 'didn`t login' do
      19. 1 within 'form', class: 'new_user', id: 'new_user' do
      20. 1 fill_in 'user_email', with: user_second.email
      21. 1 fill_in 'user_password', with: 'wrong_password'
      22. 1 click_on I18n.t('header.log_in')
      23. end
      24. 1 expect(page).to have_text 'Invalid Email or password.'
      25. end
      26. end
      27. end
      28. end

      spec/feature/new_password_spec.rb

      100.0% lines covered

      13 relevant lines. 13 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'New Password', type: :feature do
      4. 3 let(:user) { FactoryBot.create(:user) }
      5. 1 describe '#new_password' do
      6. 1 it 'change password' do
      7. 1 user.reset_password('newPassword', 'newPassword')
      8. 1 expect(user.password).to eq('newPassword')
      9. end
      10. 1 it 'not validate password' do
      11. 1 visit new_user_password_path
      12. 1 fill_in 'email', with: user.email
      13. 1 click_on I18n.t('login.send_instructions')
      14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
      15. end
      16. end
      17. end

      spec/feature/registration_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Registration', type: :feature do
      2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#sing_up' do
      4. 1 before do
      5. 3 visit new_user_registration_path
      6. end
      7. 1 context 'when successfully sing_up' do
      8. 1 it 'sing_up users' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
      11. 1 fill_in 'user_password', with: user.password
      12. 1 fill_in 'user_password_confirmation', with: user.password
      13. 1 click_on I18n.t('header.sing_up')
      14. end
      15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      16. end
      17. end
      18. 1 context 'when users is already exits' do
      19. 1 it 'sing_up users' do
      20. 1 within 'form', class: 'new_user', id: 'new_user' do
      21. 1 fill_in 'user_email', with: user.email
      22. 1 fill_in 'user_password', with: user.password
      23. 1 fill_in 'user_password_confirmation', with: user.password
      24. 1 click_on I18n.t('header.sing_up')
      25. end
      26. 1 expect(page).to have_text('Email has already been taken')
      27. end
      28. end
      29. 1 context 'when unsuccessfully sing_up' do
      30. 1 it 'didn`t sing_up' do
      31. 1 within 'form', class: 'new_user', id: 'new_user' do
      32. 1 fill_in 'user_email', with: FFaker::Internet.email
      33. 1 fill_in 'user_password', with: 'password'
      34. 1 fill_in 'user_password_confirmation', with: 'wrong'
      35. 1 click_on I18n.t('header.sing_up')
      36. end
      37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      38. end
      39. end
      40. end
      41. end

      spec/feature/review_spec.rb

      100.0% lines covered

      30 relevant lines. 30 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'Review', type: :feature do
      4. 1 include_context 'with api request authentication helper methods'
      5. 1 include_context 'with api request global before and after hooks'
      6. 3 let(:user) { FactoryBot.create(:user).decorate }
      7. 3 let(:book) { FactoryBot.create(:book).decorate }
      8. 1 before do
      9. 2 sign_in(user)
      10. 2 visit book_path(book)
      11. end
      12. 1 shared_examples 'review' do
      13. 2 it 'review' do
      14. 2 find('i', id: rating).click
      15. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
      16. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
      17. 2 click_on I18n.t('review.post')
      18. 2 expect(page).to have_content(result)
      19. end
      20. end
      21. 1 describe '#post review', js: true do
      22. 1 context 'when review posted' do
      23. 2 let(:rating) { "star#{rand(1..5)}" }
      24. 2 let(:title_words) { 5 }
      25. 2 let(:body_words) { 10 }
      26. 2 let(:result) { user.name_or_email }
      27. 1 include_examples 'review'
      28. end
      29. 1 context 'when review not been posted' do
      30. 2 let(:rating) { "star#{rand(1..5)}" }
      31. 2 let(:title_words) { 80 }
      32. 2 let(:body_words) { 30 }
      33. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      34. 1 include_examples 'review'
      35. end
      36. end
      37. end

      spec/feature/settings_spec.rb

      100.0% lines covered

      34 relevant lines. 34 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Settings', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 4 let(:user) { create(:user) }
      5. 1 before do
      6. 3 sign_in(user)
      7. 3 visit edit_user_path(user.id)
      8. 3 click_link I18n.t('settings.privacy')
      9. end
      10. 1 describe '#email_change' do
      11. 1 it 'change email' do
      12. 1 within('div', id: 'email') do
      13. 1 fill_in :email, with: FFaker::Internet.email
      14. 1 click_on I18n.t('settings.save')
      15. end
      16. 1 user.confirm
      17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      18. end
      19. end
      20. 1 describe '#password_change' do
      21. 1 context 'when error' do
      22. 1 it 'didnt change password' do
      23. 1 within('div', id: 'password') do
      24. 1 fill_in :current_password, with: user.password
      25. 1 fill_in :password, with: 'newPassword'
      26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
      27. 1 click_on I18n.t('settings.save')
      28. end
      29. 1 user.confirm
      30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
      31. end
      32. end
      33. 1 context 'when successful' do
      34. 1 it 'didnt change password' do
      35. 1 within('div', id: 'password') do
      36. 1 fill_in :current_password, with: user.password
      37. 1 fill_in :password, with: 'newPassword'
      38. 1 fill_in :password_confirmation, with: 'newPassword'
      39. 1 click_on I18n.t('settings.save')
      40. end
      41. 1 user.confirm
      42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
      43. end
      44. end
      45. end
      46. end

      spec/feature/shipping_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Shipping', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:user) { FactoryBot.create(:user) }
      5. 1 let(:attributes_for) { attributes_for(:shipping) }
      6. 1 describe '#fill_in', js: true do
      7. 1 it 'fill in shipping' do
      8. 1 sign_in(user)
      9. 1 visit edit_user_path(user.id)
      10. 1 within('div#shipping.col-md-5.mb-40') do
      11. 1 find_all('div', class: 'form-group')[0] do
      12. fill_in :first_name, with: attributes_for[:first_name]
      13. end
      14. 1 find_all('div', class: 'form-group')[1] do
      15. fill_in :last_name, with: attributes_for[:last_name]
      16. end
      17. 1 find_all('div', class: 'form-group')[2] do
      18. fill_in :address, with: attributes_for[:address]
      19. end
      20. 1 find_all('div', class: 'form-group')[3] do
      21. fill_in :city, with: attributes_for[:city]
      22. end
      23. 1 find_all('div', class: 'form-group')[4] do
      24. fill_in :zip, with: attributes_for[:zip]
      25. end
      26. 1 find_all('div', class: 'form-group')[5] do
      27. fill_in :country, with: attributes_for[:country]
      28. end
      29. 1 find_all('div', class: 'form-group')[6] do
      30. fill_in :phone, with: attributes_for[:phone]
      31. end
      32. 1 click_on I18n.t('settings.save')
      33. end
      34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      35. end
      36. end
      37. end

      spec/feature/user_spec.rb

      100.0% lines covered

      42 relevant lines. 42 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'User', type: :feature do
      2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
      3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
      4. 1 describe '#sing_up' do
      5. 1 context 'when successfully sing_up' do
      6. 1 before do
      7. 1 visit new_user_registration_path
      8. 1 within 'form', class: 'new_user', id: 'new_user' do
      9. 1 fill_in 'user_email', with: user.email
      10. 1 fill_in 'user_password', with: user.password
      11. 1 fill_in 'user_password_confirmation', with: user.password
      12. 1 click_on I18n.t('header.sing_up')
      13. end
      14. end
      15. 1 it 'sing_up user' do
      16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      17. end
      18. end
      19. 1 context 'when unsuccessfully sing_up' do
      20. 1 it 'didn`t sing_up' do
      21. 1 visit new_user_registration_path
      22. 1 within 'form', class: 'new_user', id: 'new_user' do
      23. 1 fill_in 'user_email', with: FFaker::Internet.email
      24. 1 fill_in 'user_password', with: 'wrong'
      25. 1 fill_in 'user_password_confirmation', with: 'wrong'
      26. 1 click_on I18n.t('header.sing_up')
      27. end
      28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      29. end
      30. end
      31. end
      32. 1 describe '#login' do
      33. 1 before do
      34. 2 user_second.confirm
      35. end
      36. 1 context 'when successfully login' do
      37. 1 it 'login' do
      38. 1 visit new_user_session_path
      39. 1 within 'form', class: 'new_user', id: 'new_user' do
      40. 1 fill_in 'user_email', with: user_second.email
      41. 1 fill_in 'user_password', with: user_second.password
      42. 1 click_on I18n.t('header.log_in')
      43. end
      44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      45. end
      46. end
      47. 1 context 'when unsuccessfully login' do
      48. 1 it 'didn`t login' do
      49. 1 visit new_user_session_path
      50. 1 within 'form', class: 'new_user', id: 'new_user' do
      51. 1 fill_in 'user_email', with: user_second.email
      52. 1 fill_in 'user_password', with: 'wrong_password'
      53. 1 click_on I18n.t('header.log_in')
      54. end
      55. 1 expect(page).to have_text 'Invalid Email or password.'
      56. end
      57. end
      58. end
      59. end

      spec/models/admin_user_spec.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD RSpec.describe AdminUser, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) RSpec.describe AdminUser, type: :model do ======= RSpec.describe 'Homes', type: :feature do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.describe 'Homes', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      3. 1 <<<<<<< HEAD context 'when validations' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) context 'when validations' do ======= describe 'Get Started' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) describe 'Get Started' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= describe 'Get Started' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= describe 'Get Started' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= describe 'Get Started' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      4. <<<<<<< HEAD
      5. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      6. 2 =======
      7. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      8. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      9. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      10. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      11. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      12. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      13. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      14. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      15. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD it { is_expected.to validate_presence_of(:email) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
      16. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      17. 1 >>>>>>> 7a02bbe (Featire specs) =======
      18. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      19. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      20. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= =======
      21. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      22. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= =======
      23. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      24. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      25. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= =======
      26. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      27. 1 >>>>>>> 7a02bbe (Featire specs) =======
      28. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to validate_presence_of(:email) } ======= it 'on click move to catalog page' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it 'on click move to catalog page' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      29. <<<<<<< HEAD
      30. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      31. 2 =======
      32. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      33. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      34. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      35. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      36. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      37. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      38. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      39. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      40. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD it { is_expected.to validate_presence_of(:password) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
      41. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      42. 1 >>>>>>> 7a02bbe (Featire specs) =======
      43. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      44. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      45. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= =======
      46. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      47. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= =======
      48. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      49. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      50. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= =======
      51. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      52. 1 >>>>>>> 7a02bbe (Featire specs) =======
      53. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to validate_presence_of(:password) } ======= visit root_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) visit root_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) visit root_path >>>>>>> 4e81ea2 (Featire specs) ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit root_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= visit root_path <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= visit root_path <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= visit root_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= visit root_path <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      54. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      55. 1 click_on 'Get Started'
      56. 1 expect(page).to have_content('Catalog')
      57. end
      58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      59. <<<<<<< HEAD
      60. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      61. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      62. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD
      63. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      64. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      65. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD
      66. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= =======
      67. ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      68. 1 describe 'navbar' do
      69. 2 let(:books_category) { FactoryBot.create(:books_category) }
      70. 1 it 'on click home move to root-path' do
      71. 1 visit books_path
      72. 1 find('a', id: 'root').click
      73. 1 expect(page).to have_content('Get Started')
      74. end
      75. 1 it 'on click category name move to root-path with books that belong to this category' do
      76. 1 books_category
      77. 1 visit root_path
      78. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      79. 1 within('ul', id: 'nav') do
      80. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      81. end
      82. 1 expect(page).to have_content(books_category.category.books.first.title)
      83. end
      84. end
      85. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end

      spec/models/author_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD RSpec.describe Author, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) RSpec.describe Author, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:first_name) }
      6. 2 it { is_expected.to validate_presence_of(:last_name) }
      7. end
      8. <<<<<<< HEAD ======= =======
      9. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      10. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      11. >>>>>>> 4e81ea2 (Featire specs) =======
      12. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      13. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      14. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      15. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      16. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      17. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      18. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      19. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      20. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      21. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      22. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      23. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      24. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      27. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      28. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      29. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      30. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      31. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      32. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      33. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      34. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      35. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      36. <<<<<<< HEAD
      37. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      38. =======
      39. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      40. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      41. >>>>>>> 4e81ea2 (Featire specs) =======
      42. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      43. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      44. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      45. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      46. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      47. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      48. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      50. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      51. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      53. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      54. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      55. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      56. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      57. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      58. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      59. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      60. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      61. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      62. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      63. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      64. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      65. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 <<<<<<< HEAD context 'when associations' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.describe Author, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      66. <<<<<<< HEAD
      67. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      68. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      69. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD
      70. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      71. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      72. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD
      73. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= =======
      74. ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      75. 1 describe 'author' do
      76. 1 context 'when validations' do
      77. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 2 <<<<<<< HEAD it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      78. <<<<<<< HEAD
      79. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      80. =======
      81. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      82. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      83. >>>>>>> 4e81ea2 (Featire specs) =======
      84. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      85. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      86. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      87. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      88. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      89. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      90. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      91. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      92. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      93. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      94. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      95. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      96. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      97. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      98. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      99. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      100. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      101. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      102. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      103. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      104. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      105. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      106. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      107. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 2 <<<<<<< HEAD it { is_expected.to have_many(:books).through(:authors_books) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      108. <<<<<<< HEAD
      109. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      110. =======
      111. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      112. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      113. >>>>>>> 4e81ea2 (Featire specs) =======
      114. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      115. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      116. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      117. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      118. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      119. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      120. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      121. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      122. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      123. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      124. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      125. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      126. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      127. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      128. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      129. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      130. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      131. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      132. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      133. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      134. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      135. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      136. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      137. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      138. <<<<<<< HEAD
      139. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      140. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      141. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD
      142. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      143. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      144. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD
      145. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= =======
      146. ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      147. 1 context 'when associations' do
      148. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      149. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      150. end
      151. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      152. <<<<<<< HEAD
      153. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      154. =======
      155. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      156. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      157. >>>>>>> 4e81ea2 (Featire specs) =======
      158. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      159. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      160. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      161. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      162. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      163. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      164. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      165. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      166. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      167. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      168. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      169. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      170. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      171. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      172. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      173. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      174. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      175. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      176. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      177. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      178. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      179. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      180. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      181. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end

      spec/models/authors_book_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) RSpec.describe AuthorsBook, type: :model do
      3. <<<<<<< HEAD
      4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      5. =======
      6. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      7. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      8. >>>>>>> 4e81ea2 (Featire specs) =======
      9. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      10. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      11. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      12. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      13. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      14. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      16. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      17. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      18. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      19. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      21. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      22. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      23. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      24. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      25. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      26. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      27. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      28. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      29. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      30. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      31. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      32. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 describe 'authors_book' do
      33. <<<<<<< HEAD
      34. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      35. =======
      36. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      37. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      38. >>>>>>> 4e81ea2 (Featire specs) =======
      39. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      41. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      43. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      44. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      45. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      46. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      47. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      48. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      51. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      52. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      53. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      54. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      55. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      56. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      57. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      58. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      59. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      60. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      61. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      62. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 context 'when validations' do
      63. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      64. 2 it { is_expected.to validate_presence_of(:book) }
      65. 2 it { is_expected.to validate_presence_of(:author) }
      66. end
      67. 1 context 'when associations' do
      68. 2 it { is_expected.to belong_to(:author) }
      69. 2 it { is_expected.to belong_to(:book) }
      70. end
      71. end
      72. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      7. 2 <<<<<<< HEAD it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      8. 2 <<<<<<< HEAD it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      9. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      13. <<<<<<< HEAD ======= =======
      14. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      15. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      16. >>>>>>> 4e81ea2 (Featire specs) =======
      17. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      19. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      21. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      22. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      23. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      24. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      25. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      26. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      27. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      28. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      29. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      30. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      32. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      33. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      34. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      35. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      40. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      41. <<<<<<< HEAD
      42. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      43. =======
      44. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      45. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      46. >>>>>>> 4e81ea2 (Featire specs) =======
      47. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      49. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      51. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      52. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      55. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      56. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      57. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      58. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      59. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      60. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      61. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      62. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      63. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      64. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      65. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      66. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      68. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      69. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      70. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      71. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      72. 1 context 'when not validations' do
      73. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      74. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      75. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      76. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      77. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      78. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      79. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      80. end
      81. <<<<<<< HEAD ======= =======
      82. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      83. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      84. >>>>>>> 4e81ea2 (Featire specs) =======
      85. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      86. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      87. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      88. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      89. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      90. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      91. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      92. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      93. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      94. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      95. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      96. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      97. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      98. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      99. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      100. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      101. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      102. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      103. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      104. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      105. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      106. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      107. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      108. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 context 'when associations' do
      109. <<<<<<< HEAD
      110. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      111. =======
      112. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      113. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      114. >>>>>>> 4e81ea2 (Featire specs) =======
      115. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      116. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      117. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      118. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      119. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      120. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      121. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      122. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      123. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      124. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      125. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      126. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      127. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      128. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      129. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      130. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      131. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      132. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      133. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      134. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      135. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      136. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      137. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      138. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 2 <<<<<<< HEAD it { is_expected.to belong_to(:user) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      139. <<<<<<< HEAD
      140. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      141. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      142. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD
      143. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      144. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      145. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD
      146. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= =======
      147. ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      148. 2 it { is_expected.to belong_to(:book) }
      149. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      150. <<<<<<< HEAD
      151. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      152. =======
      153. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      154. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      155. >>>>>>> 4e81ea2 (Featire specs) =======
      156. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      157. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      158. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      159. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      160. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      161. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      162. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      163. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      164. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      165. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      166. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      167. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      168. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      169. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      170. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      171. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      172. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      173. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      174. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      175. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      176. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      177. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      178. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      179. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      180. <<<<<<< HEAD
      181. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      182. =======
      183. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      184. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      185. >>>>>>> 4e81ea2 (Featire specs) =======
      186. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      187. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      188. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      189. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      190. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      191. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      192. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      193. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      194. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      195. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      196. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      197. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      198. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      199. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      200. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      201. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      202. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      203. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      204. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      205. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      206. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      207. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      208. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      209. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end

      spec/models/book_spec.rb

      100.0% lines covered

      16 relevant lines. 16 lines covered and 0 lines missed.
          
      1. 1 <<<<<<< HEAD RSpec.describe Book, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      2. <<<<<<< HEAD
      3. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      4. 1 =======
      5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      7. >>>>>>> 4e81ea2 (Featire specs) =======
      8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      12. >>>>>>> 4e81ea2 (Featire specs) =======
      13. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD describe 'books' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
      14. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      15. >>>>>>> 7a02bbe (Featire specs) =======
      16. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      17. >>>>>>> 4e81ea2 (Featire specs) =======
      18. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= =======
      19. >>>>>>> 4e81ea2 (Featire specs) =======
      20. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= =======
      21. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      22. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      23. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= =======
      24. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      25. >>>>>>> 7a02bbe (Featire specs) =======
      26. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      27. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) RSpec.describe Book, type: :model do
      28. 1 describe 'books' do
      29. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) context 'when validations' do
      30. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      31. 2 it { is_expected.to validate_presence_of(:title) }
      32. 2 it { is_expected.to validate_presence_of(:description) }
      33. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      34. 2 <<<<<<< HEAD it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:title) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      35. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:year_of_publication) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to validate_presence_of(:year_of_publication) } ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:description) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      36. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:quantity) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      37. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:materials) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      38. 2 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to validate_presence_of(:quantity) }
      39. 2 it { is_expected.to validate_presence_of(:materials) }
      40. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to validate_presence_of(:dimensions) }
      41. <<<<<<< HEAD
      42. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      43. =======
      44. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      45. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      46. >>>>>>> 4e81ea2 (Featire specs) =======
      47. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      49. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      51. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      52. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      55. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      56. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      57. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      58. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      59. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      60. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      61. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      62. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      63. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      64. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      65. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      66. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      68. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      69. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      70. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      71. <<<<<<< HEAD
      72. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      73. =======
      74. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      75. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      76. >>>>>>> 4e81ea2 (Featire specs) =======
      77. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      78. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      79. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      80. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      81. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      82. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      83. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      84. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      85. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      86. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      87. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      88. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      89. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      90. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      91. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      92. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      93. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      94. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      95. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      96. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      97. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      98. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      99. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      100. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      101. <<<<<<< HEAD
      102. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      103. =======
      104. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      105. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      106. >>>>>>> 4e81ea2 (Featire specs) =======
      107. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      108. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      109. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      110. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      111. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      112. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      113. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      114. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      115. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      116. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      117. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      118. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      119. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      120. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      121. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      122. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      123. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      124. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      125. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      126. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      127. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      128. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      129. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      130. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 context 'when associations' do
      131. <<<<<<< HEAD
      132. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      133. =======
      134. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      135. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      136. >>>>>>> 4e81ea2 (Featire specs) =======
      137. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      138. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      139. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      140. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      141. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      142. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      143. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      144. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      145. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      146. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      147. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      148. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      149. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      150. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      151. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      152. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      153. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      154. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      155. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      156. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      157. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      158. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      159. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      160. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      161. <<<<<<< HEAD
      162. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      163. =======
      164. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      165. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      166. >>>>>>> 4e81ea2 (Featire specs) =======
      167. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      168. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      169. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      170. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      171. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      172. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      173. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      174. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      175. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      176. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      177. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      178. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      179. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      180. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      181. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      182. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      183. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      184. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      185. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      186. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      187. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      188. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      189. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      190. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 2 it { is_expected.to have_many(:authors).through(:authors_books) }
      191. <<<<<<< HEAD
      192. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      193. =======
      194. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      195. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      196. >>>>>>> 4e81ea2 (Featire specs) =======
      197. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      198. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      199. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      200. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      201. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      202. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      203. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      204. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      205. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      206. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      207. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      208. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      209. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      210. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      211. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      212. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      213. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      214. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      215. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      216. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      217. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      218. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      219. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      220. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      221. <<<<<<< HEAD
      222. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      223. =======
      224. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      225. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      226. >>>>>>> 4e81ea2 (Featire specs) =======
      227. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      228. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      229. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      230. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      231. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      232. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      233. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      234. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      235. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      236. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      237. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      238. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      239. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      240. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      241. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      242. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      243. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      244. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      245. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      246. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      247. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      248. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      249. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      250. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      251. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      252. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
      253. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      254. 2 <<<<<<< HEAD it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      255. end
      256. end
      257. end

      spec/models/books_category_spec.rb

      100.0% lines covered

      <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BooksCategory, type: :model do
      2. 1 describe 'books_categories' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:category) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:category) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/category_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Category, type: :model do
      2. 1 describe 'category' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:name) }
      5. end
      6. 1 context 'when associations' do
      7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      9. end
      10. end
      11. end

      spec/models/review_spec.rb

      100.0% lines covered

      14 relevant lines. 14 lines covered and <<<<<<< HEAD ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD RSpec.describe Review, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) RSpec.describe Review, type: :model do ======= RSpec.describe BooksCategory, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.describe BooksCategory, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      3. 1 <<<<<<< HEAD describe 'review' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) describe 'review' do ======= describe 'books_categories' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) describe 'books_categories' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= describe 'books_categories' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= describe 'books_categories' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= describe 'books_categories' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      4. 1 context 'when validations' do
      5. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:title) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to validate_presence_of(:title) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      6. 2 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      9 relevant lines. 9 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 let(:user) { FactoryBot.create(:user) }
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:email) }
      6. 2 it { is_expected.to validate_presence_of(:password) } <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      7. end
      8. 1 <<<<<<< HEAD context 'with associations' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) context 'with associations' do ======= context 'when associations' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) context 'when associations' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) context 'when associations' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= context 'when associations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= context 'when associations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= context 'when associations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      9. 2 <<<<<<< HEAD it { is_expected.to have_one(:billing) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to have_one(:billing) } ======= it { is_expected.to belong_to(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to belong_to(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      10. 2 <<<<<<< HEAD it { is_expected.to have_one(:shipping) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it { is_expected.to have_one(:shipping) } ======= it { is_expected.to belong_to(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to belong_to(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      11. end
      12. end
      13. end
      <<<<<<< HEAD

      spec/queryes/book_query_spec.rb

      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

      spec/queryes/book_query_spec.rb

      =======

      spec/models/category_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)

      spec/models/category_spec.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)

      spec/models/category_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======

      spec/models/category_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======

      spec/models/category_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======

      spec/models/category_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======

      spec/models/category_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======

      spec/models/category_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======

      spec/models/category_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD 45 relevant lines. 45 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD RSpec.describe BookQuery do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) RSpec.describe BookQuery do ======= RSpec.describe Category, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.describe Category, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      3. 1 <<<<<<< HEAD shared_examples 'sort test' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) shared_examples 'sort test' do ======= describe 'category' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) describe 'category' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) describe 'category' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= describe 'category' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= describe 'category' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= describe 'category' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      4. <<<<<<< HEAD
      5. 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      6. 5 =======
      7. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      8. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      9. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      10. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      11. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      12. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      13. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      14. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      15. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD it 'sort' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
      16. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      17. 1 >>>>>>> 7a02bbe (Featire specs) =======
      18. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      19. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      20. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= =======
      21. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      22. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= =======
      23. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      24. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      25. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= =======
      26. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      27. 1 >>>>>>> 7a02bbe (Featire specs) =======
      28. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) it 'sort' do ======= context 'when validations' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) context 'when validations' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) context 'when validations' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= context 'when validations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= context 'when validations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= context 'when validations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      29. <<<<<<< HEAD
      30. 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      31. 5 =======
      32. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      33. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      34. 2 >>>>>>> 4e81ea2 (Featire specs) =======
      35. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      36. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      37. 2 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      38. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      39. 2 >>>>>>> 4e81ea2 (Featire specs) =======
      40. 2 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD books ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
      41. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      42. 2 >>>>>>> 7a02bbe (Featire specs) =======
      43. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      44. 2 >>>>>>> 4e81ea2 (Featire specs) =======
      45. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= =======
      46. 2 >>>>>>> 4e81ea2 (Featire specs) =======
      47. 2 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= =======
      48. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      49. 2 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      50. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= =======
      51. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      52. 2 >>>>>>> 7a02bbe (Featire specs) =======
      53. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) books ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      54. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      55. 5 expect(test).to eq(result)
      56. <<<<<<< HEAD ======= =======
      57. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      58. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      59. >>>>>>> 4e81ea2 (Featire specs) =======
      60. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      61. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      62. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      63. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      64. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      65. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      66. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      68. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      69. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      70. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      72. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      73. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      74. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      75. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      76. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      77. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      78. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      79. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      81. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= =======
      82. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      83. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      84. <<<<<<< HEAD
      85. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      86. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      87. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD
      88. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      89. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      90. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD
      91. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= =======
      92. ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      93. 1 context 'when associations' do
      94. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      95. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      96. end
      97. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      98. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      99. end
      <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages)

      spec/models/user_spec.rb

      100.0% lines covered

      3 relevant lines. 3 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe User, type: :model do
      3. 1 pending "add some examples to (or delete) #{__FILE__}"
      4. end
      <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

      spec/rails_helper.rb

      87.5% lines covered

      16 relevant lines. 14 lines covered and 2 lines missed.
          
      1. 1 require 'spec_helper'
      2. 1 ENV['RAILS_ENV'] ||= 'test'
      3. 1 require_relative '../config/environment'
      4. 1 abort('The Rails environment is running in production mode!') if Rails.env.production?
      5. 1 require 'rspec/rails'
      6. 1 require 'shoulda-matchers'
      7. 1 require_relative 'support/configs/shoulda_matcher'
      8. 1 require_relative 'support/configs/capybara'
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> c033601 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      10. <<<<<<< HEAD <<<<<<< HEAD
      11. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      12. 3 =======
      13. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      14. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD
      15. >>>>>>> 4e81ea2 (Featire specs) =======
      16. <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      17. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      18. >>>>>>> 4e81ea2 (Featire specs) =======
      19. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      20. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= =======
      21. >>>>>>> 4e81ea2 (Featire specs) =======
      22. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) =======
      23. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= =======
      24. >>>>>>> 4e81ea2 (Featire specs) =======
      25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= =======
      26. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      27. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
      28. 3 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= begin >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) begin >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) begin >>>>>>> 4e81ea2 (Featire specs) ======= begin >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= begin >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= begin >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= begin <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= begin >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= begin >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= let(:titles) { %w[Adam Zimbabwe] } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= begin >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= begin <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= begin >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= begin >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= begin >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= begin <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= begin >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= begin >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= begin >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= begin >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      29. 1 <<<<<<< HEAD <<<<<<< HEAD let(:books_dates) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) let(:books_dates) do ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4e81ea2 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= let(:books_dates) do >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      30. <<<<<<< HEAD <<<<<<< HEAD
      31. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      32. 1 =======
      33. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      34. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD
      35. >>>>>>> 4e81ea2 (Featire specs) =======
      36. <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      38. >>>>>>> 4e81ea2 (Featire specs) =======
      39. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      40. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= =======
      41. >>>>>>> 4e81ea2 (Featire specs) =======
      42. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) =======
      43. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= =======
      44. >>>>>>> 4e81ea2 (Featire specs) =======
      45. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= =======
      46. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      47. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
      48. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4e81ea2 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      50. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      51. =======
      52. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      53. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
      54. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
      55. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= =======
      56. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
      57. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= =======
      58. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      59. >>>>>>> 4e81ea2 (Featire specs) =======
      60. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      61. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= =======
      62. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= =======
      63. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      64. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= =======
      65. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      66. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      67. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
      68. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      69. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      70. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      71. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
      72. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) end ======= puts e.to_s.strip >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) puts e.to_s.strip >>>>>>> 4e81ea2 (Featire specs) ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= puts e.to_s.strip <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= end >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= puts e.to_s.strip <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= puts e.to_s.strip <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      73. <<<<<<< HEAD <<<<<<< HEAD
      74. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      75. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      76. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD
      77. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs)
      78. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) =======
      79. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD
      80. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= =======
      81. ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      82. exit 1
      83. end
      84. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) =======
      85. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      86. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      87. 1 describe 'all books sort' do
      88. 1 context 'when sort by title A to Z' do
      89. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      90. 1 <<<<<<< HEAD <<<<<<< HEAD let(:books) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) let(:books) do ======= RSpec.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.configure do |config| >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= let(:books) do >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      91. 1 <<<<<<< HEAD <<<<<<< HEAD create(:book, title: titles.first) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) create(:book, title: titles.first) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4e81ea2 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= create(:book, title: titles.first) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      92. 1 <<<<<<< HEAD <<<<<<< HEAD create(:book, title: titles.second) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) create(:book, title: titles.second) ======= config.use_transactional_fixtures = true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.use_transactional_fixtures = true >>>>>>> 4e81ea2 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= create(:book, title: titles.second) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      93. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      94. end
      95. 2 let(:result) { titles.second }
      96. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
      97. <<<<<<< HEAD <<<<<<< HEAD ======= =======
      98. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      99. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      100. >>>>>>> 4e81ea2 (Featire specs) =======
      101. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      102. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      103. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      104. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      105. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      106. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      107. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      108. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      109. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      110. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      111. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      112. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      113. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      114. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      115. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= =======
      116. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_examples 'sort test' ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) include_examples 'sort test' ======= config.infer_spec_type_from_file_location! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.infer_spec_type_from_file_location! >>>>>>> 4e81ea2 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= include_examples 'sort test' >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      117. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      118. end
      119. <<<<<<< HEAD <<<<<<< HEAD ======= =======
      120. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      121. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      122. >>>>>>> 4e81ea2 (Featire specs) =======
      123. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      124. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      125. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      126. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      127. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      128. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      129. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      130. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      131. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      132. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      133. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      134. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      135. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      136. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      137. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= =======
      138. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD context 'when sort title Z to A' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) context 'when sort title Z to A' do ======= config.filter_rails_from_backtrace! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.filter_rails_from_backtrace! >>>>>>> 4e81ea2 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= context 'when sort title Z to A' do >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      139. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      140. 1 let(:books) do
      141. 1 create(:book, title: titles.first)
      142. 1 create(:book, title: titles.second)
      143. end
      144. 2 let(:result) { titles.first }
      145. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
      146. 1 include_examples 'sort test'
      147. end
      148. 1 context 'when sort by price High to Low' do
      149. 1 let(:books) do
      150. 1 create(:book, price_cents: 75)
      151. 1 create(:book, price_cents: 23)
      152. end
      153. 2 let(:result) { 75 }
      154. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
      155. 1 include_examples 'sort test'
      156. end
      157. 1 context 'when sort price Low to High' do
      158. 1 let(:books) do
      159. 1 create(:book, price_cents: 75)
      160. 1 create(:book, price_cents: 23)
      161. end
      162. 2 let(:result) { 23 }
      163. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
      164. 1 include_examples 'sort test'
      165. end
      166. 1 context 'when sort by Newest' do
      167. 1 let(:books) do
      168. 1 create(:book, created_at: books_dates.first)
      169. 1 create(:book, created_at: books_dates.second)
      170. end
      171. 2 let(:result) { books_dates.first }
      172. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
      173. 1 include_examples 'sort test'
      174. end
      175. end
      176. <<<<<<< HEAD <<<<<<< HEAD ======= =======
      177. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs)
      178. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      179. >>>>>>> 4e81ea2 (Featire specs) =======
      180. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      181. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      182. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      183. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      184. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      185. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      186. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      187. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      188. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      189. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      190. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      191. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      192. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      193. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      194. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= =======
      195. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased)

      spec/support/configs/capybara.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) 100.0% ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 84003439 (Featire specs) 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 36.84% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) 36.84% >>>>>>> bd8bda4 (Manifest_cache true) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> d365be68 (Manifest_cache true) 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= 36.84% >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= ======= 36.84% >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 36.84% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= 100.0% >>>>>>> c7a726c5 (Rebased) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 36.84% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 36.84% >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) lines covered

      19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) 19 lines covered and 0 lines missed. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) 19 lines covered and 0 lines missed. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> d365be68 (Manifest_cache true) 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= 7 lines covered and 12 lines missed. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> c7a726c5 (Rebased) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
          
        <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      2. 1 =======
      3. >>>>>>> 752f0c0 (Featire specs) =======
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      5. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) =======
      6. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) =======
      7. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      8. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      9. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
      10. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 37e48018 (Featire specs) Capybara.configure do |config| >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) Capybara.configure do |config| <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) =======
      11. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
      12. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
      13. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= =======
      14. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
      15. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
      16. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) Capybara.configure do |config| <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= Capybara.configure do |config| <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= Capybara.configure do |config| >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) Capybara.configure do |config| <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) =======
      17. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) ======= =======
      18. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD =======
      19. 1 >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) Capybara.configure do |config| <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= Capybara.configure do |config| >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) Capybara.configure do |config| ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs)
      21. >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
      22. 1 =======
      23. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
      24. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d8dd3b4a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
      25. =======
      26. >>>>>>> aa7b40c (Manifest_cache true) 1 ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
      27. =======
      28. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
      29. =======
      30. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0676508 (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
      31. =======
      32. >>>>>>> aa7b40c (Manifest_cache true) 1 ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) >>>>>>> 2274daf2 (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) config.asset_host = 'http://localhost:3000' ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.asset_host = 'http://localhost:3000' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs)
      33. <<<<<<< HEAD
      34. =======
      35. >>>>>>> bd8bda4 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
      36. =======
      37. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs)
      38. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs)
      39. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) ======= ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs)
      40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      41. =======
      42. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      43. >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) =======
      44. <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) =======
      45. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= =======
      46. >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      47. =======
      48. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs)
      49. <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
      50. ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs)
      51. <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD ======= =======
      52. >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) =======
      53. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      54. =======
      55. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD 1 >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
      56. <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs)
      57. >>>>>>> 009401d (Featire specs) =======
      58. >>>>>>> 6da9530 (Featire specs) ======= =======
      59. <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs)
      60. <<<<<<< HEAD
      61. =======
      62. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      63. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) =======
      64. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) =======
      65. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) config.server_port = 3001 >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
      66. <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
      67. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs)
      68. <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) =======
      69. =======
      70. >>>>>>> fd6db03 (Manifest_cache true) 1 ======= ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) config.server_port = 3001 ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs)
      71. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      72. =======
      73. =======
      74. <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      75. =======
      76. ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      77. =======
      78. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
      79. ======= >>>>>>> 0f8241bb (Featire specs)
      80. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD =======
      81. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) config.javascript_driver = :headless_chrome ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> df37394 (Featire specs) config.default_max_wait_time = 5 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      83. =======
      84. =======
      85. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      86. =======
      87. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs)
      88. ======= >>>>>>> 5c33a07 (Featire specs)
      89. <<<<<<< HEAD =======
      90. >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      91. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      92. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.default_max_wait_time = 5 ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 904663c (Featire specs) config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      93. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD
      94. =======
      95. ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      96. =======
      97. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      98. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      99. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
      100. <<<<<<< HEAD <<<<<<< HEAD
      101. =======
      102. =======
      103. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs)
      104. <<<<<<< HEAD
      105. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) =======
      106. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      107. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) =======
      108. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= =======
      109. 1 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD end >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs)
      110. =======
      111. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= config.asset_host = 'http://localhost:3000' >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs)
      112. <<<<<<< HEAD ======= <<<<<<< HEAD =======
      113. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= >>>>>>> 490b01d6 (Manifest_cache true) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      114. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      115. =======
      116. =======
      117. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      118. =======
      119. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      120. =======
      121. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
      122. =======
      123. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      124. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      125. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      126. =======
      127. =======
      128. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      129. =======
      130. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      131. ======= >>>>>>> 5c33a07 (Featire specs)
      132. =======
      133. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      134. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 490b01d6 (Manifest_cache true)
      135. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= config.default_max_wait_time = 5 ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) config.default_driver = :rack_test >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end ======= >>>>>>> 84809242 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs)
      136. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD
      137. =======
      138. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      139. =======
      140. >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs)
      141. >>>>>>> 6da9530 (Featire specs) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      142. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      143. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
      144. <<<<<<< HEAD <<<<<<< HEAD
      145. =======
      146. =======
      147. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 84809242 (Featire specs) config.default_max_wait_time = 5 <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      148. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9d (Featire specs)
      149. =======
      150. =======
      151. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      152. ======= >>>>>>> 5c33a07 (Featire specs)
      153. =======
      154. =======
      155. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
      156. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) =======
      157. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 6e923b9d (Featire specs) ======= =======
      158. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      159. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= config.server_port = 3001 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      160. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      161. ======= =======
      162. =======
      163. >>>>>>> c8cdb08 (Manifest_cache true) =======
      164. >>>>>>> 4a0e3b6 (Manifest_cache true) =======
      165. >>>>>>> 24b58e6 (Manifest_cache true) =======
      166. >>>>>>> 00f8b58 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 >>>>>>> 11792758 (Rebased)
      167. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      168. >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      169. =======
      170. ======= >>>>>>> 5c33a07 (Featire specs)
      171. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      172. <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) =======
      173. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> 11792758 (Rebased)
      174. <<<<<<< HEAD =======
      175. 1 <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 <<<<<<< HEAD
      176. >>>>>>> 34509eee (Featire specs)
      177. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 6e923b9d (Featire specs)
      178. 1 ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      179. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      180. =======
      181. =======
      182. >>>>>>> 490b01d6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      183. <<<<<<< HEAD
      184. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
      185. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
      186. =======
      187. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      188. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= =======
      189. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
      190. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD
      191. <<<<<<< HEAD ======= =======
      192. =======
      193. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      194. =======
      195. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      196. ======= >>>>>>> 5c33a07 (Featire specs)
      197. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      198. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      199. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs)
      200. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      201. =======
      202. ======= >>>>>>> 5c33a07 (Featire specs)
      203. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
      204. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      205. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
      206. <<<<<<< HEAD <<<<<<< HEAD
      207. =======
      208. =======
      209. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs)
      210. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs)
      211. =======
      212. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) =======
      213. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      214. =======
      215. =======
      216. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
      217. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD ======= ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased)
      218. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      219. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      220. ======= ======= >>>>>>> 563720e (Featire specs) =======
      221. 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
      222. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      223. >>>>>>> 86d584a (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs)
      224. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
      225. =======
      226. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      227. =======
      228. >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs)
      229. ======= >>>>>>> 5c33a07 (Featire specs)
      230. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      231. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD =======
      232. 1 >>>>>>> c033601 (Rebased) ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
      233. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      234. =======
      235. ======= >>>>>>> 5c33a07 (Featire specs)
      236. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
      237. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      238. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
      239. <<<<<<< HEAD <<<<<<< HEAD
      240. =======
      241. =======
      242. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
      243. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs)
      244. =======
      245. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      246. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= =======
      247. =======
      248. =======
      249. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
      250. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD ======= ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased)
      251. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      252. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      253. ======= ======= >>>>>>> 563720e (Featire specs) =======
      254. 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c7a726c5 (Rebased)
      255. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      256. >>>>>>> 86d584a (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs)
      257. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) =======
      258. =======
      259. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) =======
      260. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      261. ======= >>>>>>> 5c33a07 (Featire specs)
      262. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      263. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      264. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) end ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4552227 (Featire specs) ======= config.server_port = 3001 >>>>>>> c7a726c5 (Rebased)
      265. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      266. =======
      267. >>>>>>> e9f3851 (Manifest_cache true) =======
      268. <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      269. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
      270. =======
      271. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      272. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= config.server_port = 3001 >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      273. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      274. =======
      275. >>>>>>> e9f3851 (Manifest_cache true) =======
      276. >>>>>>> d782a28 (Manifest_cache true) =======
      277. >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
      278. =======
      279. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      280. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
      281. >>>>>>> c59d1a99 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      282. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
      283. =======
      284. <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true)
      285. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      286. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= 1 >>>>>>> d0dc1f1 (Featire specs) =======
      287. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs)
      288. >>>>>>> c033601 (Rebased)
      289. >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c7a726c5 (Rebased)
      290. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      291. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
      292. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
      293. =======
      294. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      295. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
      296. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) =======
      297. =======
      298. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c7a726c5 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      299. <<<<<<< HEAD <<<<<<< HEAD
      300. ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
      301. =======
      302. =======
      303. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) =======
      304. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      305. ======= >>>>>>> 5c33a07 (Featire specs)
      306. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      307. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      308. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      309. =======
      310. ======= >>>>>>> 5c33a07 (Featire specs)
      311. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      312. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      313. <<<<<<< HEAD
      314. =======
      315. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      316. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) end ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4552227 (Featire specs)
      317. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      318. =======
      319. >>>>>>> e9f3851 (Manifest_cache true) =======
      320. <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      321. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
      322. =======
      323. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      324. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= config.server_port = 3001 >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      325. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      326. =======
      327. >>>>>>> e9f3851 (Manifest_cache true) =======
      328. >>>>>>> d782a28 (Manifest_cache true) =======
      329. >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
      330. =======
      331. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      332. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      333. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
      334. =======
      335. <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true)
      336. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      337. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= 1 >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test
      338. <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      339. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      340. ======= =======
      341. 1 config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs)
      342. <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs)
      343. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      344. <<<<<<< HEAD <<<<<<< HEAD
      345. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
      346. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
      347. =======
      348. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      349. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
      350. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) =======
      351. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 6da9530 (Featire specs)
      352. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      353. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
      354. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      355. =======
      356. >>>>>>> 752f0c0 (Featire specs) =======
      357. >>>>>>> bd8bda4 (Manifest_cache true) =======
      358. >>>>>>> 4e81ea2 (Featire specs) =======
      359. >>>>>>> aa7b40c (Manifest_cache true) =======
      360. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD 1 <<<<<<< HEAD ======= =======
      361. <<<<<<< HEAD =======
      362. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
      363. <<<<<<< HEAD =======
      364. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> c05ee511 (Featire specs) Capybara.register_driver :headless_chrome do |app| <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= end >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= config.default_driver = :rack_test >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs)
      365. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      366. ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) =======
      367. >>>>>>> e9f3851 (Manifest_cache true) =======
      368. ======= ======= >>>>>>> 36356d3 (Featire specs)
      369. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) =======
      370. >>>>>>> e3e66f3 (Featire specs) ======= =======
      371. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true) =======
      372. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      373. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD
      374. =======
      375. =======
      376. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      377. =======
      378. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      379. =======
      380. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
      381. =======
      382. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
      383. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      384. =======
      385. =======
      386. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      387. =======
      388. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      389. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      390. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs)
      391. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs)
      392. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD
      393. =======
      394. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      395. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      396. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
      397. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= =======
      398. =======
      399. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      400. =======
      401. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      402. ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      403. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      404. =======
      405. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
      406. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= config.javascript_driver = :headless_chrome >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      407. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs)
      408. =======
      409. =======
      410. >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      411. >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs)
      412. >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
      413. <<<<<<< HEAD <<<<<<< HEAD
      414. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> c59d1a99 (Manifest_cache true)
      415. 1 <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> c59d1a99 (Manifest_cache true)
      416. <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      417. =======
      418. =======
      419. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      420. =======
      421. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      422. ======= >>>>>>> 5c33a07 (Featire specs)
      423. ======= >>>>>>> c59d1a99 (Manifest_cache true)
      424. >>>>>>> 8cbdfeb (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= config.default_driver = :rack_test ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      425. 1 <<<<<<< HEAD ======= >>>>>>> 64dceec (Manifest_cache true) config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs)
      426. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs)
      427. =======
      428. =======
      429. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      430. =======
      431. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      432. =======
      433. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      434. =======
      435. =======
      436. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
      437. 1 >>>>>>> 08edf50 (Featire specs) =======
      438. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs)
      439. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      440. ======= =======
      441. =======
      442. >>>>>>> c8cdb08 (Manifest_cache true) =======
      443. >>>>>>> 4a0e3b6 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs)
      444. 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs)
      445. 1 <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      446. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
      447. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
      448. =======
      449. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      450. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      451. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= =======
      452. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      453. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      454. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      455. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs)
      456. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      457. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      458. =======
      459. >>>>>>> 752f0c0 (Featire specs) =======
      460. >>>>>>> bd8bda4 (Manifest_cache true) =======
      461. >>>>>>> 4e81ea2 (Featire specs) =======
      462. >>>>>>> aa7b40c (Manifest_cache true) =======
      463. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      464. >>>>>>> c033601 (Rebased) 1 =======
      465. <<<<<<< HEAD <<<<<<< HEAD =======
      466. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
      467. <<<<<<< HEAD <<<<<<< HEAD =======
      468. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 96aecde (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= config.default_driver = :rack_test >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 37e48018 (Featire specs) ======= ======= config.default_driver = :rack_test ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= end >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= config.default_driver = :rack_test >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 0ed7f7c (Featire specs)
      469. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      470. =======
      471. >>>>>>> e9f3851 (Manifest_cache true) =======
      472. ======= ======= >>>>>>> 36356d3 (Featire specs)
      473. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) =======
      474. >>>>>>> e3e66f3 (Featire specs) ======= =======
      475. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      476. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD
      477. =======
      478. =======
      479. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      480. =======
      481. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      482. =======
      483. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
      484. =======
      485. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
      486. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      487. =======
      488. =======
      489. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      490. =======
      491. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      492. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      493. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs)
      494. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs)
      495. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD
      496. =======
      497. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      498. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      499. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
      500. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= =======
      501. =======
      502. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      503. =======
      504. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      505. ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      506. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      507. =======
      508. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
      509. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= config.javascript_driver = :headless_chrome >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      510. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs)
      511. =======
      512. =======
      513. >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      514. >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs)
      515. >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
      516. <<<<<<< HEAD <<<<<<< HEAD
      517. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs)
      518. >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true)
      519. 1 <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= ======= >>>>>>> 904663c (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 86d584a (Manifest_cache true) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs)
      520. >>>>>>> 64dceec (Manifest_cache true)
      521. >>>>>>> 8cbdfeb (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      522. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) =======
      523. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) config.server_port = 3001 ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= config.default_driver = :rack_test ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true)
      524. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      525. =======
      526. =======
      527. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      528. =======
      529. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      530. ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0e864a5 (Manifest_cache true)
      531. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 659083f (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
      532. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
      533. ======= <<<<<<< HEAD =======
      534. ======= >>>>>>> 5c33a07 (Featire specs)
      535. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
      536. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      537. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
      538. <<<<<<< HEAD <<<<<<< HEAD
      539. =======
      540. =======
      541. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
      542. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs)
      543. =======
      544. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      545. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= =======
      546. =======
      547. =======
      548. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
      549. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD ======= ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased)
      550. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 659083f (Featire specs)
      551. <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      552. ======= ======= >>>>>>> 563720e (Featire specs) =======
      553. 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
      554. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      555. >>>>>>> 86d584a (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs)
      556. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) =======
      557. =======
      558. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) =======
      559. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      560. ======= >>>>>>> 5c33a07 (Featire specs)
      561. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      562. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= <<<<<<< HEAD
      563. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      564. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      565. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      566. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) end ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4552227 (Featire specs)
      567. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      568. =======
      569. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 6fba6be (Featire specs)
      570. <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      571. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= =======
      572. >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= config.server_port = 3001 >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs)
      573. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      574. =======
      575. >>>>>>> e9f3851 (Manifest_cache true) =======
      576. >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 6fba6be (Featire specs)
      577. <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= =======
      578. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= =======
      579. >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      580. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
      581. =======
      582. <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true)
      583. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      584. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs)
      585. >>>>>>> c033601 (Rebased)
      586. >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      587. <<<<<<< HEAD <<<<<<< HEAD
      588. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
      589. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
      590. =======
      591. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      592. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
      593. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) =======
      594. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      595. >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD ======= ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs)
      596. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs)
      597. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      598. =======
      599. >>>>>>> 752f0c0 (Featire specs) =======
      600. >>>>>>> bd8bda4 (Manifest_cache true) =======
      601. >>>>>>> 4e81ea2 (Featire specs) =======
      602. >>>>>>> aa7b40c (Manifest_cache true) =======
      603. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      604. >>>>>>> c033601 (Rebased) 1 =======
      605. =======
      606. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
      607. =======
      608. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> 96aecde (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= config.default_driver = :rack_test >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4552227 (Featire specs)
      609. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      610. =======
      611. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 6fba6be (Featire specs)
      612. =======
      613. >>>>>>> fd6db03 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
      614. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      615. =======
      616. =======
      617. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      618. =======
      619. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      620. =======
      621. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
      622. >>>>>>> add330c (Manifest_cache true) =======
      623. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
      624. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      625. =======
      626. =======
      627. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      628. =======
      629. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      630. >>>>>>> 35d17b9 (Manifest_cache true) =======
      631. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs)
      632. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs)
      633. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD
      634. =======
      635. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      636. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      637. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
      638. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= =======
      639. =======
      640. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      641. =======
      642. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      643. ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= =======
      644. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      645. =======
      646. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
      647. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= config.javascript_driver = :headless_chrome >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs)
      648. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      649. =======
      650. =======
      651. >>>>>>> 2722d07 (Manifest_cache true) =======
      652. >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs)
      653. >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs)
      654. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs)
      655. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) config.default_max_wait_time = 5 ======= ======= >>>>>>> 2ee03d3 (Featire specs) config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0b43b18 (Manifest_cache true) ======= config.server_port = 3001 >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= config.default_max_wait_time = 5 ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 0b43b18 (Manifest_cache true)
      656. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      657. =======
      658. =======
      659. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      660. =======
      661. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      662. ======= >>>>>>> 5c33a07 (Featire specs)
      663. =======
      664. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      665. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true)
      666. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> 3e9f99d (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.default_max_wait_time = 5 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs)
      667. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      668. ======= <<<<<<< HEAD =======
      669. ======= >>>>>>> 5c33a07 (Featire specs)
      670. =======
      671. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      672. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      673. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
      674. <<<<<<< HEAD <<<<<<< HEAD
      675. =======
      676. =======
      677. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs)
      678. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs)
      679. =======
      680. =======
      681. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      682. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= =======
      683. =======
      684. =======
      685. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
      686. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= =======
      687. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD ======= ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs)
      688. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 3e9f99d (Featire specs)
      689. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= =======
      690. 1 <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs)
      691. <<<<<<< HEAD =======
      692. 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs)
      693. 1 <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      694. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs)
      695. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      696. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= =======
      697. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      698. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
      699. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= end >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs)
      700. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
      701. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      702. =======
      703. >>>>>>> 752f0c0 (Featire specs) =======
      704. >>>>>>> bd8bda4 (Manifest_cache true) =======
      705. >>>>>>> 4e81ea2 (Featire specs) =======
      706. >>>>>>> aa7b40c (Manifest_cache true) =======
      707. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      708. >>>>>>> c033601 (Rebased) 1 =======
      709. =======
      710. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
      711. <<<<<<< HEAD =======
      712. >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) ======= end <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> 96aecde (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= config.default_driver = :rack_test
      713. 1 config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs)
      714. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      715. =======
      716. =======
      717. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      718. =======
      719. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      720. >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 51bc18c (Featire specs)
      721. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
      722. =======
      723. =======
      724. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      725. =======
      726. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      727. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs)
      728. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
      729. =======
      730. ======= ======= >>>>>>> 84003439 (Featire specs)
      731. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      732. =======
      733. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      734. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      735. >>>>>>> 37e48018 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      736. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      737. ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      738. >>>>>>> 84809242 (Featire specs) 1 config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased)
      739. <<<<<<< HEAD
      740. 1 ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.server_port = 3001 >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      741. ======= <<<<<<< HEAD
      742. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      743. =======
      744. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      745. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) =======
      746. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= =======
      747. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= end
      748. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 34509eee (Featire specs)
      749. >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      750. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      751. >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> bf554f4 (Rebased)
      752. >>>>>>> 11792758 (Rebased) end
      753. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased)
      754. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      755. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      756. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      757. >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= end
      758. <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> e5752db (Featire specs)
      759. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= =======
      760. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> da3a9a3 (Featire specs)
      761. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= =======
      762. <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs)
      763. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs)
      764. >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= =======
      765. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs)
      766. >>>>>>> 49e8a6c (Rebased) =======
      767. =======
      768. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      769. ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= =======
      770. =======
      771. =======
      772. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7c4ea7f (Fix)
      773. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true)
      774. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0b43b18 (Manifest_cache true)
      775. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      776. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= =======
      777. ======= <<<<<<< HEAD =======
      778. =======
      779. >>>>>>> c8cdb08 (Manifest_cache true) =======
      780. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) 1 config.default_driver = :rack_test
      781. <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true)
      782. >>>>>>> 96aecde (Manifest_cache true) =======
      783. >>>>>>> 2c640cf (Manifest_cache true) =======
      784. >>>>>>> 0b43b18 (Manifest_cache true) 1 config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
      785. =======
      786. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      787. >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      788. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs)
      789. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true)
      790. >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      791. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      792. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      793. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= 1 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> ae07231a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= end >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= config.default_driver = :rack_test >>>>>>> ae07231a (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs)
      794. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true)
      795. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      796. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      797. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      798. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      799. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      800. ======= =======
      801. 1 =======
      802. >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) config.default_driver = :rack_test
      803. >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD
      804. >>>>>>> 96aecde (Manifest_cache true) =======
      805. >>>>>>> 2c640cf (Manifest_cache true) 1 config.javascript_driver = :headless_chrome <<<<<<< HEAD ======= ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
      806. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true)
      807. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
      808. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      809. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      810. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      811. ======= ======= >>>>>>> 4fac471d (Manifest_cache true)
      812. >>>>>>> 96aecde (Manifest_cache true) =======
      813. >>>>>>> 2c640cf (Manifest_cache true) 1 config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs)
      814. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true)
      815. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs)
      816. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> cc390719 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> cc390719 (Manifest_cache true)
      817. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= =======
      818. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      819. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      820. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true)
      821. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
      822. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      823. =======
      824. >>>>>>> 752f0c0 (Featire specs) =======
      825. >>>>>>> bd8bda4 (Manifest_cache true) =======
      826. >>>>>>> 4e81ea2 (Featire specs) =======
      827. >>>>>>> aa7b40c (Manifest_cache true) =======
      828. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
      829. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      830. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> bc6bc8d2 (Rebased)
      831. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      832. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) >>>>>>> d2e6b3c (Featire specs)
      833. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
      834. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      835. =======
      836. >>>>>>> 752f0c0 (Featire specs) =======
      837. >>>>>>> bd8bda4 (Manifest_cache true) =======
      838. >>>>>>> 4e81ea2 (Featire specs) =======
      839. >>>>>>> aa7b40c (Manifest_cache true) =======
      840. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= ======= =======
      841. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= =======
      842. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      843. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= 1 ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 659083f (Featire specs)
      844. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      845. 1 >>>>>>> 752f0c0 (Featire specs) =======
      846. >>>>>>> bd8bda4 (Manifest_cache true) =======
      847. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      848. >>>>>>> aa7b40c (Manifest_cache true) =======
      849. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      850. >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) =======
      851. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      852. =======
      853. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
      854. =======
      855. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) >>>>>>> 11792758 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 11792758 (Rebased) Capybara.register_driver :headless_chrome do |app| ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
      856. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
      857. 1 ======= <<<<<<< HEAD <<<<<<< HEAD
      858. >>>>>>> ae2a012 (Manifest_cache true) =======
      859. 1 >>>>>>> 752f0c0 (Featire specs) =======
      860. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      861. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      862. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      863. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      864. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD
      865. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      866. ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      867. >>>>>>> 11792758 (Rebased) >>>>>>> 75fa7e1b (Rebased) =======
      868. 1 >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
      869. 1 >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      870. <<<<<<< HEAD ======= <<<<<<< HEAD
      871. =======
      872. >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
      873. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
      874. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      875. =======
      876. >>>>>>> 752f0c0 (Featire specs) =======
      877. >>>>>>> bd8bda4 (Manifest_cache true) =======
      878. >>>>>>> 4e81ea2 (Featire specs) =======
      879. >>>>>>> aa7b40c (Manifest_cache true) =======
      880. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= =======
      881. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) 1 ======= <<<<<<< HEAD
      882. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      883. 1 >>>>>>> 752f0c0 (Featire specs) =======
      884. >>>>>>> bd8bda4 (Manifest_cache true) =======
      885. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      886. >>>>>>> aa7b40c (Manifest_cache true) =======
      887. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
      888. >>>>>>> 183b6c5 (Manifest_cache true) =======
      889. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      890. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      891. =======
      892. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
      893. =======
      894. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= =======
      895. =======
      896. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= =======
      897. =======
      898. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> af057e3 (Featire specs) ======= config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)
      899. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      900. ======= ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true)
      901. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      902. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) =======
      903. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= =======
      904. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs)
      905. =======
      906. =======
      907. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      908. ======= >>>>>>> 5c33a07 (Featire specs)
      909. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      910. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs)
      911. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      912. =======
      913. ======= >>>>>>> 5c33a07 (Featire specs)
      914. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      915. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      916. <<<<<<< HEAD
      917. =======
      918. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs)
      919. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      920. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs)
      921. =======
      922. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs)
      923. >>>>>>> c033601 (Rebased) >>>>>>> 2a25e4c (Featire specs)
      924. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= =======
      925. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      926. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) =======
      927. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end
      928. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs)
      929. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs)
      930. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      931. =======
      932. >>>>>>> 752f0c0 (Featire specs) =======
      933. >>>>>>> bd8bda4 (Manifest_cache true) =======
      934. >>>>>>> 4e81ea2 (Featire specs) =======
      935. >>>>>>> aa7b40c (Manifest_cache true) =======
      936. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 1 =======
      937. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      938. ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
      939. <<<<<<< HEAD ======= ======= =======
      940. =======
      941. ======= =======
      942. <<<<<<< HEAD ======= =======
      943. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      944. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
      945. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= =======
      946. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= end
      947. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs)
      948. <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs)
      949. >>>>>>> e9f3851 (Manifest_cache true) 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) Capybara.register_driver :headless_chrome do |app| >>>>>>> 307f31f (Manifest_cache true) ======= Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs)
      950. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      951. ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true)
      952. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) =======
      953. >>>>>>> 307f31f (Manifest_cache true) ======= ======= =======
      954. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) 1 <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= =======
      955. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      956. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) =======
      957. 1 <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) =======
      958. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= =======
      959. 1 >>>>>>> 752f0c0 (Featire specs) =======
      960. >>>>>>> bd8bda4 (Manifest_cache true) =======
      961. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      962. >>>>>>> aa7b40c (Manifest_cache true) =======
      963. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) Capybara.register_driver :headless_chrome do |app|
      964. <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs)
      965. 1 <<<<<<< HEAD =======
      966. >>>>>>> ae2a012 (Manifest_cache true) =======
      967. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      968. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) =======
      969. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) =======
      970. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      971. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5506bd0 (Featire specs) =======
      972. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      973. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= =======
      974. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD =======
      975. >>>>>>> fd6db03 (Manifest_cache true) =======
      976. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
      977. >>>>>>> 49e8a6c (Rebased) =======
      978. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      979. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= =======
      980. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      981. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) client = Selenium::WebDriver::Remote::Http::Default.new ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD ======= end ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> af057e3 (Featire specs) ======= ======= end >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= ======= <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
      982. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      983. =======
      984. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      985. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= =======
      986. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      987. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
      988. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      989. >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b7749a (Fix)
      990. end
      991. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      992. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      993. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      994. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      995. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      996. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      997. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true)
      998. ======= ======= >>>>>>> 183b6c5 (Manifest_cache true)
      999. =======
      1000. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      1001. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1002. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1003. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      1004. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      1005. ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
      1006. <<<<<<< HEAD ======= ======= =======
      1007. =======
      1008. =======
      1009. >>>>>>> e9f3851 (Manifest_cache true) 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 5b7749a (Fix) Capybara.register_driver :headless_chrome do |app| >>>>>>> e3e66f3 (Featire specs)
      1010. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs)
      1011. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 563720e (Featire specs) =======
      1012. >>>>>>> 307f31f (Manifest_cache true) =======
      1013. >>>>>>> 0ed7f7c (Featire specs) 1 =======
      1014. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      1015. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
      1016. 1 <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) =======
      1017. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      1018. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD ======= =======
      1019. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1020. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1021. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1022. >>>>>>> aa7b40c (Manifest_cache true) =======
      1023. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 93bdda9 (Featire specs) =======
      1024. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      1025. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      1026. 1 >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) =======
      1027. >>>>>>> ae2a012 (Manifest_cache true) =======
      1028. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      1029. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1030. 1 >>>>>>> 08edf50 (Featire specs) =======
      1031. 1 >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1032. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) =======
      1033. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1034. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1035. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
      1036. 1 >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD =======
      1037. >>>>>>> fd6db03 (Manifest_cache true) =======
      1038. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
      1039. >>>>>>> 49e8a6c (Rebased) =======
      1040. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1041. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1042. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
      1043. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1044. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      1045. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      1046. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
      1047. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1048. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1049. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1050. >>>>>>> aa7b40c (Manifest_cache true) =======
      1051. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) client = Selenium::WebDriver::Remote::Http::Default.new ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 0d6dd12 (Manifest_cache true) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs)
      1052. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1053. 1 ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= >>>>>>> b28889f (Fix) >>>>>>> 99dad91f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      1054. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
      1055. >>>>>>> 59d75f9 (Featire specs) =======
      1056. >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price)
      1057. >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= <<<<<<< HEAD
      1058. 1 =======
      1059. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) ======= =======
      1060. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1061. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1062. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1063. >>>>>>> aa7b40c (Manifest_cache true) =======
      1064. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true) client = Selenium::WebDriver::Remote::Http::Default.new <<<<<<< HEAD ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) client = Selenium::WebDriver::Remote::Http::Default.new ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> af057e3 (Featire specs) ======= ======= end >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
      1065. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      1066. =======
      1067. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      1068. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= =======
      1069. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      1070. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
      1071. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      1072. >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b7749a (Fix)
      1073. end
      1074. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1075. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      1076. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1077. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1078. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      1079. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      1080. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true)
      1081. ======= ======= >>>>>>> 183b6c5 (Manifest_cache true)
      1082. =======
      1083. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      1084. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1085. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1086. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      1087. >>>>>>> 5b7749a (Fix) =======
      1088. >>>>>>> ebcdce06 (Featire specs) 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD
      1089. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1090. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1091. ======= ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      1092. >>>>>>> 84003439 (Featire specs) 1 =======
      1093. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 84003439 (Featire specs) ======= =======
      1094. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1095. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1096. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1097. >>>>>>> aa7b40c (Manifest_cache true) =======
      1098. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      1099. ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
      1100. <<<<<<< HEAD ======= ======= =======
      1101. =======
      1102. =======
      1103. >>>>>>> e9f3851 (Manifest_cache true) 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 5b7749a (Fix) Capybara.register_driver :headless_chrome do |app| >>>>>>> e3e66f3 (Featire specs)
      1104. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs)
      1105. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) =======
      1106. >>>>>>> 307f31f (Manifest_cache true) ======= ======= =======
      1107. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) 1 =======
      1108. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      1109. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
      1110. 1 <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) =======
      1111. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD ======= =======
      1112. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1113. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1114. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1115. >>>>>>> aa7b40c (Manifest_cache true) =======
      1116. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) Capybara.register_driver :headless_chrome do |app|
      1117. <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs)
      1118. 1 <<<<<<< HEAD =======
      1119. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      1120. 1 >>>>>>> e3e66f3 (Featire specs) =======
      1121. >>>>>>> ae2a012 (Manifest_cache true) =======
      1122. 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      1123. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1124. 1 >>>>>>> 08edf50 (Featire specs) =======
      1125. 1 <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1126. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) =======
      1127. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= =======
      1128. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1129. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD =======
      1130. >>>>>>> fd6db03 (Manifest_cache true) =======
      1131. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
      1132. >>>>>>> 49e8a6c (Rebased) =======
      1133. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1134. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1135. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
      1136. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1137. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      1138. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      1139. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) client = Selenium::WebDriver::Remote::Http::Default.new ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= Capybara.register_driver :headless_chrome do |app| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 0d6dd12 (Manifest_cache true) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
      1140. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1141. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      1142. ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      1143. >>>>>>> 59d75f9 (Featire specs) =======
      1144. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
      1145. 1 =======
      1146. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
      1147. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1148. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1149. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1150. >>>>>>> aa7b40c (Manifest_cache true) =======
      1151. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      1152. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1153. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 72b9cab (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) =======
      1154. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs)
      1155. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      1156. =======
      1157. >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
      1158. ======= <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) =======
      1159. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD
      1160. 1 =======
      1161. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      1162. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1163. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      1164. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1165. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      1166. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
      1167. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      1168. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1169. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      1170. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      1171. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
      1172. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      1173. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1174. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1175. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1176. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1177. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1178. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1179. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1180. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1181. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1182. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1183. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1184. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1185. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1186. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1187. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      1188. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1189. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
      1190. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1191. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1192. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1193. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) =======
      1194. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      1195. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1196. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
      1197. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1198. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1199. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
      1200. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
      1201. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= =======
      1202. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1203. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= =======
      1204. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= ======= =======
      1205. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= =======
      1206. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= =======
      1207. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= ======= =======
      1208. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      1209. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      1210. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= ======= =======
      1211. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= =======
      1212. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1213. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
      1214. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) =======
      1215. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
      1216. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1217. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1218. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1219. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1220. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 448bef30 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) client.read_timeout = 150 >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1221. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1222. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1223. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1224. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1225. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1226. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1227. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1228. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1229. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1230. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1231. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      1232. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1233. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) client.read_timeout = 150 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= client.read_timeout = 150 ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= client.read_timeout = 150 ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) client.read_timeout = 150 ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4e81ea2 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= client.read_timeout = 150 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 0d6dd12 (Manifest_cache true) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= client.read_timeout = 150 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 0d6dd12 (Manifest_cache true) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= client.read_timeout = 150 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= client.read_timeout = 150 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= client.read_timeout = 150 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1234. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      1235. 1 ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> b28889f (Fix) >>>>>>> 99dad91f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      1236. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> a56ba36d (Manifest_cache true) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
      1237. >>>>>>> 59d75f9 (Featire specs) =======
      1238. >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 973ba8c (Featire specs)
      1239. >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= <<<<<<< HEAD
      1240. 1 =======
      1241. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) ======= =======
      1242. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1243. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1244. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1245. >>>>>>> aa7b40c (Manifest_cache true) =======
      1246. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1247. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1248. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1249. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) =======
      1250. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      1251. =======
      1252. >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
      1253. ======= <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) =======
      1254. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD
      1255. 1 =======
      1256. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      1257. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1258. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      1259. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1260. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      1261. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
      1262. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      1263. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1264. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 11792758 (Rebased) ======= =======
      1265. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      1266. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1267. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1268. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1269. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1270. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1271. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1272. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1273. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1274. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1275. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1276. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1277. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1278. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      1279. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
      1280. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1281. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1282. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1283. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1284. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1285. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1286. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1287. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1288. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1289. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1290. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1291. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1292. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1293. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
      1294. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1295. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1296. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1297. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) =======
      1298. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      1299. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1300. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1301. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
      1302. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
      1303. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= =======
      1304. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
      1305. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1306. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= =======
      1307. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= =======
      1308. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      1309. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      1310. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= =======
      1311. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= client.read_timeout = 150 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs)
      1312. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs)
      1313. ======= <<<<<<< HEAD
      1314. 1 =======
      1315. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1316. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1317. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1318. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1319. >>>>>>> aa7b40c (Manifest_cache true) =======
      1320. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
      1321. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1322. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      1323. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
      1324. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      1325. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======
      1326. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1327. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      1328. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true)
      1329. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= =======
      1330. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs)
      1331. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1332. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true)
      1333. =======
      1334. 1 >>>>>>> 08edf50 (Featire specs) =======
      1335. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1336. 1 >>>>>>> 7a02bbe (Featire specs) =======
      1337. >>>>>>> fd6db03 (Manifest_cache true) =======
      1338. 1 >>>>>>> 4552227 (Featire specs) =======
      1339. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true)
      1340. =======
      1341. 1 >>>>>>> 08edf50 (Featire specs) =======
      1342. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1343. 1 >>>>>>> 7a02bbe (Featire specs) =======
      1344. >>>>>>> fd6db03 (Manifest_cache true) =======
      1345. 1 >>>>>>> 4552227 (Featire specs) =======
      1346. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) >>>>>>> 4a2f2ad8 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs)
      1347. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 16ebb0ff (Manifest_cache true)
      1348. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
      1349. ======= <<<<<<< HEAD
      1350. 1 =======
      1351. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1352. 1 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) =======
      1353. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1354. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1355. >>>>>>> aa7b40c (Manifest_cache true) =======
      1356. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= =======
      1357. <<<<<<< HEAD >>>>>>> 183b6c5 (Manifest_cache true) =======
      1358. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
      1359. 1 >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) =======
      1360. 1 >>>>>>> 70fcacc (Featire specs) =======
      1361. >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0ed7f7c (Featire specs) =======
      1362. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= =======
      1363. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= =======
      1364. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= =======
      1365. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
      1366. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 11792758 (Rebased) =======
      1367. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 31d15e66 (Fix) =======
      1368. 1 >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) =======
      1369. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
      1370. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= =======
      1371. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      1372. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1373. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
      1374. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= =======
      1375. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      1376. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1377. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= =======
      1378. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1379. <<<<<<< HEAD
      1380. =======
      1381. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1382. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) =======
      1383. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      1384. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1385. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      1386. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true)
      1387. =======
      1388. 1 >>>>>>> 08edf50 (Featire specs) =======
      1389. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= =======
      1390. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1391. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1392. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1393. ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true)
      1394. 1 <<<<<<< HEAD ======= ======= <<<<<<< HEAD
      1395. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      1396. 1 >>>>>>> e3e66f3 (Featire specs) =======
      1397. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      1398. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true)
      1399. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) =======
      1400. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) =======
      1401. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) =======
      1402. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased) =======
      1403. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) =======
      1404. 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3be4d14 (Manifest_cache true) =======
      1405. >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8181d13 (Featire specs) ======= =======
      1406. 1 <<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      1407. 1 >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= =======
      1408. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 5506bd0 (Featire specs) ======= =======
      1409. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= =======
      1410. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= =======
      1411. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= =======
      1412. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> b3f2049 (Featire specs) =======
      1413. 1 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1414. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1415. 1 <<<<<<< HEAD <<<<<<< HEAD =======
      1416. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      1417. =======
      1418. 1 <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      1419. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1420. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1421. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      1422. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
      1423. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true)
      1424. ======= <<<<<<< HEAD
      1425. 1 =======
      1426. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
      1427. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      1428. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      1429. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1430. <<<<<<< HEAD
      1431. =======
      1432. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1433. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      1434. 1 >>>>>>> 08edf50 (Featire specs) =======
      1435. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1436. 1 >>>>>>> 7a02bbe (Featire specs) =======
      1437. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1438. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1439. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs)
      1440. 1 <<<<<<< HEAD <<<<<<< HEAD =======
      1441. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
      1442. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
      1443. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= =======
      1444. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1445. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
      1446. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
      1447. ======= <<<<<<< HEAD
      1448. 1 =======
      1449. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
      1450. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      1451. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      1452. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      1453. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      1454. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      1455. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      1456. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1457. <<<<<<< HEAD
      1458. =======
      1459. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1460. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) =======
      1461. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD =======
      1462. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1463. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      1464. ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> fd6db03 (Manifest_cache true) =======
      1465. 1 >>>>>>> 4552227 (Featire specs) =======
      1466. <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) =======
      1467. 1 >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      1468. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= options = ::Selenium::WebDriver::Chrome::Options.new
      1469. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) options.headless! >>>>>>> 84003439 (Featire specs)
      1470. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true)
      1471. =======
      1472. 1 >>>>>>> 08edf50 (Featire specs) =======
      1473. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= =======
      1474. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1475. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1476. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD
      1477. 1 <<<<<<< HEAD ======= ======= <<<<<<< HEAD
      1478. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      1479. 1 >>>>>>> e3e66f3 (Featire specs) =======
      1480. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      1481. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      1482. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1483. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1484. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
      1485. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
      1486. >>>>>>> 49e8a6c (Rebased) =======
      1487. 1 >>>>>>> 872e675 (Fix) =======
      1488. >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      1489. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      1490. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
      1491. 1 >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1492. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1493. 1 <<<<<<< HEAD <<<<<<< HEAD =======
      1494. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      1495. =======
      1496. 1 <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      1497. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1498. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1499. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      1500. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
      1501. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true)
      1502. ======= <<<<<<< HEAD
      1503. 1 =======
      1504. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
      1505. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      1506. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      1507. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1508. <<<<<<< HEAD
      1509. =======
      1510. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1511. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      1512. 1 >>>>>>> 08edf50 (Featire specs) =======
      1513. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1514. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      1515. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1516. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1517. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      1518. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) options.headless!
      1519. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1520. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1521. =======
      1522. >>>>>>> 752f0c0 (Featire specs) =======
      1523. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1524. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true)
      1525. >>>>>>> aa7b40c (Manifest_cache true) =======
      1526. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) =======
      1527. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 659083f (Featire specs) >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
      1528. =======
      1529. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> a636fda (Featire specs) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= =======
      1530. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      1531. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> 56531f25 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= =======
      1532. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
      1533. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
      1534. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1535. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      1536. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
      1537. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> bd30d038 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
      1538. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      1539. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1540. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= =======
      1541. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
      1542. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1543. =======
      1544. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1545. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1546. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1547. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      1548. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
      1549. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= =======
      1550. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      1551. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      1552. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1553. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      1554. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      1555. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
      1556. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      1557. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1558. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= =======
      1559. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      1560. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1561. =======
      1562. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1563. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1564. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1565. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      1566. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
      1567. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= =======
      1568. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      1569. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      1570. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1571. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      1572. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
      1573. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= =======
      1574. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1575. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= =======
      1576. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      1577. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= =======
      1578. =======
      1579. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
      1580. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= =======
      1581. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
      1582. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
      1583. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
      1584. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= =======
      1585. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
      1586. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= =======
      1587. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
      1588. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======
      1589. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1590. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      1591. 1 ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 99dad91f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      1592. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> cc390719 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs)
      1593. 1 =======
      1594. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> d34a0770 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1595. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1596. >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true)
      1597. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1598. >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) >>>>>>> 42e9c2e (Manifest_cache true) >>>>>>> 16ebb0ff (Manifest_cache true)
      1599. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1600. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1601. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1602. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1603. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1604. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> e18eb87 (Fix) =======
      1605. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> d365be68 (Manifest_cache true) >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 1cce66c (Manifest_cache true) =======
      1606. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs)
      1607. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= ======= ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> c0159bf (Manifest_cache true)
      1608. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1609. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1610. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) =======
      1611. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) =======
      1612. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) =======
      1613. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      1614. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1615. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> fdab719f (Fix) =======
      1616. <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      1617. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1618. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      1619. 1 >>>>>>> c7a726c5 (Rebased) =======
      1620. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1621. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1622. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1623. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1624. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1625. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1626. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1627. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) =======
      1628. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      1629. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1630. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1631. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      1632. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1633. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= =======
      1634. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= =======
      1635. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
      1636. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
      1637. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= =======
      1638. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1639. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= =======
      1640. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= =======
      1641. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) options.add_argument('--no-sandbox')
      1642. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> 2612be03 (Featire specs)
      1643. 1 ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      1644. ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      1645. ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)
      1646. 1 =======
      1647. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1648. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1649. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1650. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1651. >>>>>>> aa7b40c (Manifest_cache true) =======
      1652. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 56531f25 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 5e31aeb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true)
      1653. 1 =======
      1654. <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1655. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1656. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1657. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1658. >>>>>>> aa7b40c (Manifest_cache true) =======
      1659. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1660. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1661. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1662. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> ae07231a (Featire specs)
      1663. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1664. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1665. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
      1666. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1667. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      1668. ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      1669. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
      1670. <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
      1671. 1 <<<<<<< HEAD >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= =======
      1672. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) ======= =======
      1673. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1674. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1675. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1676. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1677. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1678. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1679. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1680. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1681. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
      1682. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
      1683. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= =======
      1684. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
      1685. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) =======
      1686. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1687. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
      1688. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1689. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
      1690. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1691. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1692. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
      1693. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
      1694. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1695. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= =======
      1696. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= ======= =======
      1697. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= =======
      1698. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) ======= =======
      1699. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
      1700. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= =======
      1701. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
      1702. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD options.add_argument('--disable-dev-shm-usage') >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1703. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1704. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1705. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1706. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1707. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1708. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1709. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1710. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1711. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1712. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      1713. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1714. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      1715. 1 >>>>>>> c7a726c5 (Rebased) ======= options.add_argument('--disable-dev-shm-usage') ======= ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= options.add_argument('--no-sandbox') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--no-sandbox') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1716. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1717. 1 ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= >>>>>>> b28889f (Fix) >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1718. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1719. 1 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) =======
      1720. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1721. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1722. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1723. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1724. >>>>>>> aa7b40c (Manifest_cache true) =======
      1725. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--disable-dev-shm-usage') ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= options.add_argument('--no-sandbox') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--no-sandbox') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      1726. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1727. 1 ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      1728. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1729. 1 ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) =======
      1730. 1 ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> d34a0770 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      1731. 1 ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true)
      1732. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1733. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1734. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1735. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1736. >>>>>>> aa7b40c (Manifest_cache true) =======
      1737. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1738. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1739. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 72b9cab (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1740. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) =======
      1741. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs)
      1742. >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a71befd (Manifest_cache true)
      1743. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> a71befd (Manifest_cache true)
      1744. =======
      1745. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      1746. ======= <<<<<<< HEAD
      1747. 1 =======
      1748. >>>>>>> ebcdce06 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      1749. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1750. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      1751. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1752. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      1753. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
      1754. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      1755. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1756. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      1757. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      1758. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
      1759. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      1760. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1761. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1762. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1763. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1764. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1765. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1766. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1767. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1768. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1769. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1770. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1771. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1772. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1773. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1774. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      1775. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1776. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
      1777. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1778. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1779. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1780. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) =======
      1781. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      1782. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1783. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
      1784. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1785. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1786. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
      1787. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
      1788. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= =======
      1789. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1790. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= =======
      1791. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= ======= =======
      1792. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= =======
      1793. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= ======= =======
      1794. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1795. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1796. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1797. >>>>>>> aa7b40c (Manifest_cache true) =======
      1798. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= =======
      1799. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
      1800. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= ======= =======
      1801. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= =======
      1802. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1803. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
      1804. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) =======
      1805. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= =======
      1806. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1807. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1808. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1809. >>>>>>> aa7b40c (Manifest_cache true) =======
      1810. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
      1811. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1812. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1813. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1814. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1815. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 448bef30 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) options.add_argument('--window-size=1400,1400') >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1816. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1817. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1818. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1819. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1820. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1821. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1822. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1823. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1824. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1825. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1826. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      1827. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1828. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) options.add_argument('--window-size=1400,1400') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--window-size=1400,1400') ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--window-size=1400,1400') ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) options.add_argument('--window-size=1400,1400') ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1829. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      1830. 1 ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> b28889f (Fix) >>>>>>> 99dad91f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      1831. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> a56ba36d (Manifest_cache true) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
      1832. >>>>>>> 59d75f9 (Featire specs) =======
      1833. >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 973ba8c (Featire specs)
      1834. >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= <<<<<<< HEAD
      1835. 1 =======
      1836. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) ======= =======
      1837. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1838. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1839. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1840. >>>>>>> aa7b40c (Manifest_cache true) =======
      1841. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1842. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1843. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 72b9cab (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1844. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) =======
      1845. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      1846. =======
      1847. >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
      1848. ======= <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) =======
      1849. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD
      1850. 1 =======
      1851. =======
      1852. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      1853. ======= <<<<<<< HEAD
      1854. 1 =======
      1855. >>>>>>> ebcdce06 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      1856. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1857. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      1858. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1859. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      1860. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
      1861. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      1862. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1863. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      1864. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      1865. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
      1866. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      1867. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1868. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1869. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1870. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1871. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1872. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1873. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1874. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1875. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1876. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1877. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1878. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1879. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1880. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1881. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      1882. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1883. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
      1884. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1885. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1886. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1887. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) =======
      1888. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      1889. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1890. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
      1891. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1892. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1893. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
      1894. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
      1895. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= =======
      1896. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1897. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= =======
      1898. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= ======= =======
      1899. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= =======
      1900. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= =======
      1901. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= ======= =======
      1902. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      1903. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      1904. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= ======= =======
      1905. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= =======
      1906. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1907. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
      1908. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) =======
      1909. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= =======
      1910. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1911. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1912. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1913. >>>>>>> aa7b40c (Manifest_cache true) =======
      1914. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
      1915. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1916. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1917. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1918. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1919. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 448bef30 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) options.add_argument('--allow-insecure-localhost') >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1920. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1921. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1922. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1923. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1924. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1925. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1926. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1927. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1928. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1929. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1930. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      1931. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1932. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) options.add_argument('--allow-insecure-localhost') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--allow-insecure-localhost') ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) options.add_argument('--allow-insecure-localhost') ======= options.add_argument('--window-size=1400,1400') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--window-size=1400,1400') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--window-size=1400,1400') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      1933. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      1934. 1 ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> b28889f (Fix) >>>>>>> 99dad91f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      1935. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> a56ba36d (Manifest_cache true) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
      1936. >>>>>>> 59d75f9 (Featire specs) =======
      1937. >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 973ba8c (Featire specs)
      1938. >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= <<<<<<< HEAD
      1939. 1 =======
      1940. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) ======= =======
      1941. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1942. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1943. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1944. >>>>>>> aa7b40c (Manifest_cache true) =======
      1945. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1946. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1947. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 72b9cab (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1948. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) =======
      1949. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1950. ======= <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) =======
      1951. >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
      1952. ======= <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) =======
      1953. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD
      1954. 1 =======
      1955. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
      1956. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1957. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      1958. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1959. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= =======
      1960. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= ======= =======
      1961. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      1962. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1963. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) ======= ======= =======
      1964. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      1965. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= =======
      1966. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) ======= =======
      1967. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1968. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1969. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1970. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1971. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1972. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1973. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1974. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1975. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1976. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1977. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1978. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs)
      1979. ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1980. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1981. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1982. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      1983. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) =======
      1984. <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD
      1985. 1 =======
      1986. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      1987. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs)
      1988. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      1989. ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      1990. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
      1991. 1 =======
      1992. >>>>>>> ebcdce06 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
      1993. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1994. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      1995. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1996. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      1997. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
      1998. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      1999. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      2000. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      2001. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      2002. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
      2003. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      2004. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      2005. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      2006. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      2007. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2008. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2009. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      2010. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      2011. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      2012. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      2013. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2014. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2015. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2016. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      2017. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      2018. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      2019. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ef483b6d (Fix) ======= =======
      2020. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      2021. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= =======
      2022. 1 >>>>>>> 752f0c0 (Featire specs) =======
      2023. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2024. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      2025. >>>>>>> aa7b40c (Manifest_cache true) =======
      2026. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
      2027. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      2028. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= =======
      2029. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      2030. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      2031. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      2032. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
      2033. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2034. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
      2035. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
      2036. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
      2037. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
      2038. >>>>>>> bf554f4 (Rebased) =======
      2039. 1 >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
      2040. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      2041. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      2042. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      2043. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) =======
      2044. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      2045. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      2046. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
      2047. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      2048. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      2049. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
      2050. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
      2051. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= =======
      2052. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
      2053. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
      2054. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= =======
      2055. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      2056. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= =======
      2057. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= =======
      2058. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      2059. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      2060. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= =======
      2061. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= =======
      2062. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2063. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
      2064. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= options.add_argument('--allow-insecure-localhost') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs)
      2065. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs)
      2066. 1 ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> b28889f (Fix) >>>>>>> 99dad91f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      2067. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
      2068. >>>>>>> 59d75f9 (Featire specs) =======
      2069. >>>>>>> 6da9530 (Featire specs) =======
      2070. >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= <<<<<<< HEAD
      2071. 1 =======
      2072. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) ======= =======
      2073. 1 >>>>>>> 752f0c0 (Featire specs) =======
      2074. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2075. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      2076. >>>>>>> aa7b40c (Manifest_cache true) =======
      2077. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      2078. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2079. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      2080. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) =======
      2081. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      2082. =======
      2083. >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs)
      2084. ======= <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) =======
      2085. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD
      2086. 1 =======
      2087. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      2088. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      2089. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      2090. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      2091. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      2092. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
      2093. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      2094. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      2095. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 11792758 (Rebased) ======= =======
      2096. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      2097. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      2098. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      2099. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      2100. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2101. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2102. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      2103. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      2104. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2105. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2106. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2107. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      2108. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      2109. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      2110. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
      2111. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      2112. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      2113. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      2114. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      2115. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2116. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2117. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      2118. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      2119. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2120. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2121. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2122. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      2123. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      2124. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
      2125. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      2126. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      2127. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      2128. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) =======
      2129. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      2130. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      2131. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      2132. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
      2133. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
      2134. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= =======
      2135. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
      2136. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      2137. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= =======
      2138. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      2139. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs)
      2140. ======= <<<<<<< HEAD
      2141. 1 =======
      2142. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      2143. 1 >>>>>>> 752f0c0 (Featire specs) =======
      2144. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2145. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD =======
      2146. >>>>>>> aa7b40c (Manifest_cache true) =======
      2147. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
      2148. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2149. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      2150. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
      2151. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      2152. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======
      2153. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2154. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      2155. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs)
      2156. ======= <<<<<<< HEAD
      2157. 1 ======= >>>>>>> 5506bd0 (Featire specs)
      2158. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= =======
      2159. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs)
      2160. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2161. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      2162. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= =======
      2163. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs)
      2164. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs)
      2165. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
      2166. ======= <<<<<<< HEAD
      2167. 1 =======
      2168. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      2169. 1 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) =======
      2170. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2171. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      2172. >>>>>>> aa7b40c (Manifest_cache true) =======
      2173. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= =======
      2174. <<<<<<< HEAD >>>>>>> 183b6c5 (Manifest_cache true) =======
      2175. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
      2176. 1 >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) =======
      2177. 1 >>>>>>> 70fcacc (Featire specs) =======
      2178. >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0ed7f7c (Featire specs) =======
      2179. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= =======
      2180. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= =======
      2181. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= =======
      2182. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
      2183. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 11792758 (Rebased) =======
      2184. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 31d15e66 (Fix) =======
      2185. 1 >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) =======
      2186. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
      2187. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= =======
      2188. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      2189. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2190. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
      2191. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= =======
      2192. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      2193. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2194. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= =======
      2195. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      2196. <<<<<<< HEAD
      2197. =======
      2198. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      2199. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) =======
      2200. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      2201. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2202. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 8181d13 (Featire specs)
      2203. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true)
      2204. =======
      2205. 1 >>>>>>> 08edf50 (Featire specs) =======
      2206. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= =======
      2207. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      2208. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      2209. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      2210. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      2211. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      2212. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      2213. ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true)
      2214. 1 <<<<<<< HEAD ======= ======= <<<<<<< HEAD
      2215. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      2216. 1 >>>>>>> e3e66f3 (Featire specs) =======
      2217. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      2218. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true)
      2219. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) =======
      2220. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) =======
      2221. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) =======
      2222. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased) =======
      2223. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) =======
      2224. 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3be4d14 (Manifest_cache true) =======
      2225. >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= =======
      2226. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= =======
      2227. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= =======
      2228. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= =======
      2229. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= =======
      2230. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= =======
      2231. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> b3f2049 (Featire specs) =======
      2232. 1 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      2233. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      2234. 1 <<<<<<< HEAD <<<<<<< HEAD =======
      2235. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      2236. =======
      2237. 1 <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      2238. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2239. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2240. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      2241. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
      2242. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      2243. ======= <<<<<<< HEAD
      2244. 1 =======
      2245. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
      2246. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      2247. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      2248. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      2249. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2250. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      2251. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      2252. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      2253. <<<<<<< HEAD
      2254. =======
      2255. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      2256. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      2257. 1 >>>>>>> 08edf50 (Featire specs) =======
      2258. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2259. 1 >>>>>>> 7a02bbe (Featire specs) =======
      2260. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      2261. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      2262. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs)
      2263. 1 <<<<<<< HEAD <<<<<<< HEAD =======
      2264. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
      2265. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
      2266. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= =======
      2267. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2268. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
      2269. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price)
      2270. ======= <<<<<<< HEAD
      2271. 1 =======
      2272. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 3e9f99d (Featire specs) =======
      2273. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      2274. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      2275. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      2276. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= =======
      2277. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= =======
      2278. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) =======
      2279. 1 >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      2280. <<<<<<< HEAD <<<<<<< HEAD
      2281. =======
      2282. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      2283. >>>>>>> aa7b40c (Manifest_cache true) =======
      2284. 1 >>>>>>> 08edf50 (Featire specs) =======
      2285. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      2286. =======
      2287. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      2288. 1 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
      2289. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      2290. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= =======
      2291. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2292. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      2293. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs)
      2294. ======= <<<<<<< HEAD
      2295. >>>>>>> 0b43b18 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) =======
      2296. >>>>>>> fd6db03 (Manifest_cache true) =======
      2297. 1 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) =======
      2298. >>>>>>> 998f08d (Manifest_cache true) =======
      2299. 1 >>>>>>> 2a25e4c (Featire specs) =======
      2300. 1 >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
      2301. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
      2302. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) =======
      2303. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2304. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) options.add_argument('--accept-insecure-certs=true') >>>>>>> 610b6138 (Featire specs)
      2305. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true)
      2306. =======
      2307. 1 >>>>>>> 08edf50 (Featire specs) =======
      2308. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= =======
      2309. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      2310. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      2311. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      2312. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      2313. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      2314. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD
      2315. 1 <<<<<<< HEAD ======= ======= <<<<<<< HEAD
      2316. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      2317. 1 >>>>>>> e3e66f3 (Featire specs) =======
      2318. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      2319. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      2320. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2321. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      2322. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
      2323. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
      2324. >>>>>>> 49e8a6c (Rebased) =======
      2325. 1 >>>>>>> 872e675 (Fix) =======
      2326. >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
      2327. 1 >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) options.add_argument('--ignore-certificate-errors=true')
      2328. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      2329. 1 <<<<<<< HEAD <<<<<<< HEAD =======
      2330. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      2331. =======
      2332. 1 <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      2333. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2334. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2335. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      2336. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
      2337. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      2338. ======= <<<<<<< HEAD
      2339. 1 =======
      2340. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
      2341. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      2342. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      2343. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      2344. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2345. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      2346. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      2347. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      2348. <<<<<<< HEAD
      2349. =======
      2350. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      2351. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      2352. 1 >>>>>>> 08edf50 (Featire specs) =======
      2353. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2354. 1 >>>>>>> 7a02bbe (Featire specs) =======
      2355. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      2356. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      2357. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      2358. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) options.add_argument('--accept-insecure-certs=true')
      2359. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      2360. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      2361. =======
      2362. >>>>>>> 752f0c0 (Featire specs) =======
      2363. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2364. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true)
      2365. >>>>>>> aa7b40c (Manifest_cache true) =======
      2366. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) =======
      2367. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 659083f (Featire specs) >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)
      2368. =======
      2369. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> a636fda (Featire specs) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= =======
      2370. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      2371. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> 56531f25 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= =======
      2372. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
      2373. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
      2374. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2375. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      2376. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
      2377. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> bd30d038 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
      2378. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      2379. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2380. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= =======
      2381. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
      2382. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2383. =======
      2384. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2385. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2386. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2387. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      2388. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
      2389. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= =======
      2390. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      2391. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      2392. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      2393. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      2394. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      2395. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
      2396. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      2397. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2398. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= =======
      2399. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      2400. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2401. =======
      2402. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2403. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2404. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2405. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      2406. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
      2407. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= =======
      2408. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      2409. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      2410. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      2411. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      2412. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
      2413. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= =======
      2414. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2415. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= =======
      2416. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      2417. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= =======
      2418. =======
      2419. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
      2420. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= =======
      2421. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
      2422. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
      2423. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
      2424. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= =======
      2425. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
      2426. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= =======
      2427. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
      2428. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======
      2429. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      2430. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs)
      2431. 1 ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 99dad91f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)
      2432. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> cc390719 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs)
      2433. >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
      2434. 1 =======
      2435. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> d34a0770 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      2436. 1 >>>>>>> 752f0c0 (Featire specs) =======
      2437. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) =======
      2438. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) =======
      2439. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs)
      2440. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      2441. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
      2442. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> d52f9efe (Featire specs)
      2443. =======
      2444. >>>>>>> d0dc1f1 (Featire specs) 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      2445. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs)
      2446. =======
      2447. >>>>>>> d0dc1f1 (Featire specs) 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      2448. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      2449. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      2450. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      2451. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      2452. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
      2453. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      2454. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
      2455. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 4367ccb1 (Manifest_cache true)
      2456. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      2457. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
      2458. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2459. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      2460. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2461. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
      2462. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      2463. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      2464. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      2465. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      2466. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      2467. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2468. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
      2469. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      2470. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      2471. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      2472. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      2473. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
      2474. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
      2475. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      2476. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      2477. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) =======
      2478. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
      2479. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= =======
      2480. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
      2481. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
      2482. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
      2483. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= =======
      2484. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      2485. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= =======
      2486. 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
      2487. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) Capybara::Selenium::Driver.new(
      2488. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      2489. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true)
      2490. =======
      2491. >>>>>>> 4e81ea2 (Featire specs) =======
      2492. >>>>>>> aa7b40c (Manifest_cache true) =======
      2493. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) =======
      2494. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true)
      2495. =======
      2496. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> a636fda (Featire specs) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= =======
      2497. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      2498. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      2499. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      2500. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) >>>>>>> b832d45 (Featire specs) ======= =======
      2501. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
      2502. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2503. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      2504. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
      2505. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) =======
      2506. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) ======= =======
      2507. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      2508. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2509. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= =======
      2510. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
      2511. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2512. =======
      2513. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2514. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2515. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2516. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2517. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2518. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
      2519. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= =======
      2520. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      2521. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      2522. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      2523. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      2524. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs)
      2525. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true)
      2526. =======
      2527. >>>>>>> 4e81ea2 (Featire specs) =======
      2528. >>>>>>> aa7b40c (Manifest_cache true) =======
      2529. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2530. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2531. =======
      2532. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      2533. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      2534. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= =======
      2535. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      2536. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= =======
      2537. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
      2538. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2539. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
      2540. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      2541. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      2542. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      2543. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      2544. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2545. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= =======
      2546. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      2547. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2548. =======
      2549. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2550. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2551. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2552. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2553. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2554. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
      2555. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= =======
      2556. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      2557. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      2558. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      2559. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      2560. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= =======
      2561. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2562. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= =======
      2563. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      2564. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= =======
      2565. =======
      2566. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
      2567. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= =======
      2568. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
      2569. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= =======
      2570. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
      2571. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
      2572. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= =======
      2573. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
      2574. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= =======
      2575. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
      2576. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======
      2577. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) app,
      2578. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      2579. >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD
      2580. ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
      2581. =======
      2582. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= =======
      2583. >>>>>>> 02a399d (Manifest_cache true) =======
      2584. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      2585. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2586. >>>>>>> 4e81ea2 (Featire specs) =======
      2587. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= =======
      2588. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      2589. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2590. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 9e081dc (Fix)
      2591. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= =======
      2592. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      2593. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= =======
      2594. >>>>>>> 752f0c0 (Featire specs) =======
      2595. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2596. >>>>>>> 4e81ea2 (Featire specs) =======
      2597. >>>>>>> aa7b40c (Manifest_cache true) =======
      2598. >>>>>>> 08edf50 (Featire specs) =======
      2599. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2600. >>>>>>> 7a02bbe (Featire specs) =======
      2601. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      2602. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      2603. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix)
      2604. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= =======
      2605. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2606. >>>>>>> 4e81ea2 (Featire specs) =======
      2607. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= =======
      2608. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      2609. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2610. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5e31aeb (Featire specs)
      2611. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= =======
      2612. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= =======
      2613. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= =======
      2614. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD app, ======= browser: :chrome, >>>>>>> c7a726c5 (Rebased)
      2615. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      2616. ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs)
      2617. =======
      2618. >>>>>>> d0dc1f1 (Featire specs) =======
      2619. >>>>>>> 02a399d (Manifest_cache true) =======
      2620. >>>>>>> 752f0c0 (Featire specs) =======
      2621. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2622. >>>>>>> 4e81ea2 (Featire specs) =======
      2623. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      2624. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      2625. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2626. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD
      2627. <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
      2628. =======
      2629. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
      2630. >>>>>>> 02a399d (Manifest_cache true) =======
      2631. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      2632. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2633. >>>>>>> 4e81ea2 (Featire specs) =======
      2634. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= =======
      2635. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      2636. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2637. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true)
      2638. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= =======
      2639. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
      2640. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= =======
      2641. >>>>>>> 752f0c0 (Featire specs) =======
      2642. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2643. >>>>>>> 4e81ea2 (Featire specs) =======
      2644. >>>>>>> aa7b40c (Manifest_cache true) =======
      2645. >>>>>>> 08edf50 (Featire specs) =======
      2646. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2647. >>>>>>> 7a02bbe (Featire specs) =======
      2648. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      2649. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      2650. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix)
      2651. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      2652. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      2653. >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD browser: :chrome, ======= http_client: client, >>>>>>> c7a726c5 (Rebased)
      2654. <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs)
      2655. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs)
      2656. =======
      2657. >>>>>>> d0dc1f1 (Featire specs) =======
      2658. >>>>>>> 02a399d (Manifest_cache true) =======
      2659. >>>>>>> 752f0c0 (Featire specs) =======
      2660. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2661. >>>>>>> 4e81ea2 (Featire specs) =======
      2662. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      2663. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      2664. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2665. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD
      2666. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
      2667. ======= ======= ======= >>>>>>> 08edf50 (Featire specs) =======
      2668. ======= >>>>>>> 93bdda9 (Featire specs)
      2669. >>>>>>> d0dc1f1 (Featire specs) ======= =======
      2670. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      2671. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      2672. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      2673. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs)
      2674. =======
      2675. >>>>>>> d0dc1f1 (Featire specs) =======
      2676. >>>>>>> 02a399d (Manifest_cache true) =======
      2677. >>>>>>> 752f0c0 (Featire specs) =======
      2678. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2679. >>>>>>> 4e81ea2 (Featire specs) =======
      2680. >>>>>>> aa7b40c (Manifest_cache true) =======
      2681. >>>>>>> 08edf50 (Featire specs) =======
      2682. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      2683. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      2684. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
      2685. >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
      2686. ======= ======= ======= >>>>>>> 08edf50 (Featire specs) =======
      2687. ======= >>>>>>> 93bdda9 (Featire specs)
      2688. >>>>>>> d0dc1f1 (Featire specs) ======= =======
      2689. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      2690. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      2691. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      2692. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      2693. =======
      2694. >>>>>>> d0dc1f1 (Featire specs) =======
      2695. >>>>>>> 02a399d (Manifest_cache true) =======
      2696. >>>>>>> 752f0c0 (Featire specs) =======
      2697. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2698. >>>>>>> 4e81ea2 (Featire specs) =======
      2699. >>>>>>> aa7b40c (Manifest_cache true) =======
      2700. >>>>>>> 08edf50 (Featire specs) =======
      2701. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      2702. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) browser: :chrome,
      2703. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs)
      2704. ======= ======= ======= >>>>>>> 08edf50 (Featire specs) =======
      2705. ======= >>>>>>> 93bdda9 (Featire specs)
      2706. >>>>>>> d0dc1f1 (Featire specs) ======= =======
      2707. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      2708. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      2709. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      2710. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= =======
      2711. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
      2712. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= =======
      2713. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
      2714. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= =======
      2715. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      2716. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) browser: :chrome,
      2717. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 715fac2 (Featire specs) =======
      2718. ======= >>>>>>> 2a25e4c (Featire specs)
      2719. >>>>>>> d0dc1f1 (Featire specs) browser: :chrome,
      2720. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
      2721. =======
      2722. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= =======
      2723. >>>>>>> 02a399d (Manifest_cache true) =======
      2724. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD http_client: client, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= <<<<<<< HEAD options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, ======= options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      2725. <<<<<<< HEAD
      2726. =======
      2727. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 715fac2 (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      2728. >>>>>>> df37394 (Featire specs)
      2729. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs)
      2730. >>>>>>> 02a399d (Manifest_cache true) =======
      2731. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      2732. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2733. >>>>>>> 4e81ea2 (Featire specs) =======
      2734. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= =======
      2735. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2736. >>>>>>> 4e81ea2 (Featire specs) =======
      2737. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= =======
      2738. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= =======
      2739. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2740. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs)
      2741. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= =======
      2742. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= =======
      2743. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) http_client: client, <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD =======
      2744. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 3e9f99d (Featire specs)
      2745. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      2746. >>>>>>> d0dc1f1 (Featire specs) =======
      2747. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      2748. >>>>>>> 752f0c0 (Featire specs) =======
      2749. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
      2750. >>>>>>> 4e81ea2 (Featire specs) =======
      2751. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      2752. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      2753. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2754. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= =======
      2755. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= =======
      2756. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= =======
      2757. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= =======
      2758. >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) ======= =======
      2759. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) ======= =======
      2760. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= =======
      2761. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      2762. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= =======
      2763. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
      2764. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD
      2765. >>>>>>> df37394 (Featire specs)
      2766. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
      2767. >>>>>>> 02a399d (Manifest_cache true) =======
      2768. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      2769. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2770. >>>>>>> 4e81ea2 (Featire specs) =======
      2771. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= =======
      2772. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      2773. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2774. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2775. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs)
      2776. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= =======
      2777. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= =======
      2778. >>>>>>> 08edf50 (Featire specs) =======
      2779. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      2780. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      2781. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      2782. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix)
      2783. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD browser: :chrome,
      2784. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs)
      2785. =======
      2786. >>>>>>> d0dc1f1 (Featire specs) =======
      2787. >>>>>>> 02a399d (Manifest_cache true) =======
      2788. >>>>>>> 752f0c0 (Featire specs) =======
      2789. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2790. >>>>>>> 4e81ea2 (Featire specs) =======
      2791. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      2792. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      2793. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2794. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
      2795. >>>>>>> 11792758 (Rebased) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD http_client: client, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= http_client: client, <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= http_client: client, <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4d4cf6b4 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) ======= options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs)
      2796. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased)
      2797. <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD =======
      2798. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
      2799. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD
      2800. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
      2801. <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
      2802. >>>>>>> d0dc1f1 (Featire specs) =======
      2803. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2804. >>>>>>> 752f0c0 (Featire specs) =======
      2805. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2806. >>>>>>> 4e81ea2 (Featire specs) =======
      2807. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      2808. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      2809. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2810. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 255dd8d (Manifest_cache true) =======
      2811. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= =======
      2812. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2813. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2814. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= =======
      2815. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= =======
      2816. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= =======
      2817. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= =======
      2818. >>>>>>> 08edf50 (Featire specs) =======
      2819. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      2820. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      2821. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      2822. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      2823. >>>>>>> df37394 (Featire specs)
      2824. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
      2825. >>>>>>> 02a399d (Manifest_cache true) =======
      2826. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      2827. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2828. >>>>>>> 4e81ea2 (Featire specs) =======
      2829. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= =======
      2830. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      2831. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2832. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2833. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs)
      2834. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= =======
      2835. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= =======
      2836. >>>>>>> 08edf50 (Featire specs) =======
      2837. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      2838. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      2839. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      2840. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix)
      2841. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) http_client: client, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= http_client: client, <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= http_client: client, <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> d8abfed3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= http_client: client, >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      2842. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased)
      2843. <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD =======
      2844. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs)
      2845. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD
      2846. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
      2847. <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
      2848. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      2849. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2850. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD
      2851. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2852. >>>>>>> 4e81ea2 (Featire specs) =======
      2853. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      2854. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      2855. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2856. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 255dd8d (Manifest_cache true) =======
      2857. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= =======
      2858. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2859. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2860. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= =======
      2861. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= =======
      2862. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= =======
      2863. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= =======
      2864. >>>>>>> 08edf50 (Featire specs) =======
      2865. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      2866. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      2867. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      2868. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= http_client: client, >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      2869. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      2870. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2871. =======
      2872. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs)
      2873. >>>>>>> 02a399d (Manifest_cache true) =======
      2874. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true)
      2875. ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD
      2876. =======
      2877. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      2878. >>>>>>> 02a399d (Manifest_cache true) =======
      2879. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      2880. >>>>>>> 4e81ea2 (Featire specs) =======
      2881. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= =======
      2882. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      2883. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= =======
      2884. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) =======
      2885. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2886. >>>>>>> 7a02bbe (Featire specs) =======
      2887. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      2888. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) ======= >>>>>>> ca274ec (Manifest_cache true) >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> 72b9cab (Featire specs) >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 42e9c2e (Manifest_cache true) >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      2889. ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) >>>>>>> 86229876 (Manifest_cache true)
      2890. =======
      2891. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs)
      2892. >>>>>>> 02a399d (Manifest_cache true) =======
      2893. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
      2894. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) =======
      2895. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      2896. >>>>>>> 4e81ea2 (Featire specs) =======
      2897. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= =======
      2898. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= =======
      2899. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= =======
      2900. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= =======
      2901. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= =======
      2902. >>>>>>> 4e81ea2 (Featire specs) =======
      2903. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= =======
      2904. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= =======
      2905. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= =======
      2906. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) ======= ======= =======
      2907. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) ======= ======= =======
      2908. >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= =======
      2909. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= =======
      2910. >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= =======
      2911. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= =======
      2912. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
      2913. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      2914. =======
      2915. >>>>>>> d0dc1f1 (Featire specs) =======
      2916. >>>>>>> 02a399d (Manifest_cache true) =======
      2917. >>>>>>> 752f0c0 (Featire specs) =======
      2918. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2919. >>>>>>> 4e81ea2 (Featire specs) =======
      2920. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      2921. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
      2922. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2923. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2924. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
      2925. >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) =======
      2926. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2927. >>>>>>> 7a02bbe (Featire specs) =======
      2928. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= =======
      2929. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
      2930. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) =======
      2931. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= =======
      2932. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2933. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2934. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD =======
      2935. >>>>>>> 49e8a6c (Rebased) ======= =======
      2936. >>>>>>> 08edf50 (Featire specs) =======
      2937. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= =======
      2938. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      2939. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) >>>>>>> 36356d3 (Featire specs) ======= =======
      2940. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
      2941. >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      2942. >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= =======
      2943. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
      2944. >>>>>>> 11792758 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= =======
      2945. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 4f4ea3f9 (Featire specs) ) ======= ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      2946. <<<<<<< HEAD
      2947. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs)
      2948. =======
      2949. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
      2950. >>>>>>> 02a399d (Manifest_cache true) =======
      2951. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
      2952. <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
      2953. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD
      2954. >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2955. >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD
      2956. >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2957. >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2958. >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83d (Rebased)
      2959. <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2960. >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased)
      2961. <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
      2962. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true)
      2963. =======
      2964. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs)
      2965. >>>>>>> 02a399d (Manifest_cache true) =======
      2966. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
      2967. <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
      2968. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD
      2969. >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD
      2970. >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2971. >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD
      2972. >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2973. >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD
      2974. >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2975. >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD
      2976. >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2977. >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD
      2978. >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2979. >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2980. >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased)
      2981. <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
      2982. =======
      2983. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      2984. >>>>>>> 02a399d (Manifest_cache true) =======
      2985. >>>>>>> 752f0c0 (Featire specs) =======
      2986. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      2987. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) ======= =======
      2988. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 2ee03d3 (Featire specs) ======= =======
      2989. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= =======
      2990. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2991. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= =======
      2992. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
      2993. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
      2994. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= =======
      2995. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= =======
      2996. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= =======
      2997. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
      2998. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= =======
      2999. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
      3000. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= =======
      3001. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
      3002. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= =======
      3003. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) )
      3004. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD
      3005. >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      3006. >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD
      3007. >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      3008. >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      3009. >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased)
      3010. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
      3011. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true)
      3012. =======
      3013. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true)
      3014. >>>>>>> 02a399d (Manifest_cache true) =======
      3015. >>>>>>> 752f0c0 (Featire specs) =======
      3016. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      3017. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) ======= =======
      3018. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= =======
      3019. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
      3020. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      3021. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      3022. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
      3023. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD
      3024. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= =======
      3025. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      3026. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      3027. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= =======
      3028. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      3029. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      3030. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      3031. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      3032. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      3033. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
      3034. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= =======
      3035. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      3036. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      3037. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      3038. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      3039. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= )
      3040. ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= =======
      3041. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= =======
      3042. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      3043. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      3044. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= =======
      3045. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      3046. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      3047. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      3048. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      3049. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      3050. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
      3051. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= =======
      3052. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      3053. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      3054. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      3055. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      3056. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= =======
      3057. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= )
      3058. ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) end

      spec/support/configs/shoulda_matcher.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 Shoulda::Matchers.configure do |config|
      2. 1 config.integrate do |with|
      3. 1 with.test_framework :rspec
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      5. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs)
      6. 1 =======
      7. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      8. >>>>>>> 752f0c0 (Featire specs) =======
      9. >>>>>>> 4e81ea2 (Featire specs) =======
      10. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
      11. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
      12. 1 >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
      13. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      14. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
      17. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      18. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) =======
      19. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
      20. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      21. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      22. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      23. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      24. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
      25. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      26. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) =======
      27. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
      28. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
      29. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= =======
      30. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= =======
      31. >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= =======
      32. 1 >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) with.library :active_record ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= with.library :active_record ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) with.library :active_record ======= # Keep as many of these lines as are necessary: >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= with.library :active_record >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 0d6dd12 (Manifest_cache true) ======= # Keep as many of these lines as are necessary: >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= with.library :active_record >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= with.library :active_record >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      33. =======
      34. >>>>>>> c7a726c5 (Rebased) 1 ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) with.library :active_record ======= >>>>>>> 610b6138 (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= with.library :active_record >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) with.library :active_record ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) with.library :active_record ======= # Keep as many of these lines as are necessary: >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 0d6dd12 (Manifest_cache true) ======= # Keep as many of these lines as are necessary: >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= with.library :active_record >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= with.library :active_record >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= with.library :active_record >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= with.library :active_record >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      35. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) with.library :active_record
      36. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) with.library :active_model
      37. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      38. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      39. ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
      40. ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs)
      41. =======
      42. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      43. >>>>>>> 752f0c0 (Featire specs) =======
      44. >>>>>>> 4e81ea2 (Featire specs) =======
      45. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      46. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
      47. >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= =======
      48. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      49. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      50. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= =======
      51. >>>>>>> 0d6dd12 (Manifest_cache true) =======
      52. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      54. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
      55. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
      56. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= =======
      57. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
      58. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= =======
      59. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
      60. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      61. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      62. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
      63. >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      64. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      65. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= =======
      66. >>>>>>> 0d6dd12 (Manifest_cache true) =======
      67. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      68. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      69. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
      70. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      71. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= =======
      72. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= =======
      73. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= =======
      74. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      75. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) =======
      76. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      77. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      78. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      79. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= =======
      80. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= =======
      81. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= =======
      82. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= =======
      83. >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= =======
      84. >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= =======
      85. >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= =======
      86. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      87. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= =======
      88. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= =======
      89. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      90. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs)
      91. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      92. ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
      93. ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs)
      94. =======
      95. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      96. >>>>>>> 752f0c0 (Featire specs) =======
      97. >>>>>>> 4e81ea2 (Featire specs) =======
      98. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      99. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
      100. >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= =======
      101. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) =======
      102. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      103. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= =======
      104. >>>>>>> 0d6dd12 (Manifest_cache true) =======
      105. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      106. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      107. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
      108. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
      109. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= =======
      110. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
      111. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= =======
      112. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
      113. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      114. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      115. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
      116. >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      117. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      118. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= =======
      119. >>>>>>> 0d6dd12 (Manifest_cache true) =======
      120. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      121. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      122. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
      123. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      124. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= =======
      125. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= =======
      126. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= =======
      127. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
      128. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) =======
      129. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= =======
      130. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      131. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= =======
      132. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= =======
      133. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= =======
      134. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= =======
      135. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= =======
      136. >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= =======
      137. >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= =======
      138. >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= =======
      139. >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= =======
      140. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= =======
      141. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= =======
      142. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 08e21b3 (Manifest_cache true) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f506ffd0 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7cf77f7b (Manifest_cache true) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f506ffd0 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 08e21b3 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7cf77f7b (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 379e583 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 58c2c0f1 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> b904d7ae (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> a2206025 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1622d61 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9afd7e66 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> a45f1ec (Add login registration pages) <<<<<<< HEAD >>>>>>> 3b954593 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> add330c (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 5a7e688 (Add User and Review Decorators and Show Review) <<<<<<< HEAD >>>>>>> 4bf50361 (Add User and Review Decorators and Show Review) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1622d61 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f506ffd0 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> a45f1ec (Add login registration pages) <<<<<<< HEAD >>>>>>> b3f4cb6c (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> add330c (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 5a7e688 (Add User and Review Decorators and Show Review) <<<<<<< HEAD >>>>>>> 835651a9 (Add User and Review Decorators and Show Review) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 08e21b3 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7cf77f7b (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)